insideout10 / wordlift-plugin

src/admin/wordlift_admin_edit_post.php

Doc Comments +1 added lines, -1 removed lines

@@ -12,7 +12,7 @@
  * @param string $new_title Optional. New title.
  * @param string $new_slug Optional. New slug.
  *
- * @return The enhanced html.
+ * @return string enhanced html.
  */
 function wl_admin_permalink_html( $html, $post_id, $new_title, $new_slug ) {
 

Indentation +16 added lines, -16 removed lines

@@ -16,23 +16,23 @@
  */
 function wl_admin_permalink_html( $html, $post_id, $new_title, $new_slug ) {
 
-	// If the post is published, add the button to view Redlink's linked data.
-	if ( 'publish' == get_post_status( $post_id ) ) {
-		if ( $uri = wl_get_entity_uri( $post_id ) ) {
-			$uri_esc       = esc_attr( wl_get_entity_uri( $post_id ) );
-			$lod_view_href = 'http://lodview.it/lodview/?IRI=' . $uri_esc;
-			$html .= "<span id='view-post-btn'><a href='$lod_view_href' class='button button-small wl-button' target='_blank'>" .
-			         __( 'View Linked Data', 'wordlift' ) .
-			         "</a></span>\n";
-		}
-		$html .= "<span id='view-post-btn'><a href='" . WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL .
-		         urlencode( get_permalink( $post_id ) ) .
-		         "' class='button button-small wl-button' target='_blank'>" .
-		         __( 'Test Google Rich Snippets', 'wordlift' ) .
-		         "</a></span>\n";
-	}
+    // If the post is published, add the button to view Redlink's linked data.
+    if ( 'publish' == get_post_status( $post_id ) ) {
+        if ( $uri = wl_get_entity_uri( $post_id ) ) {
+            $uri_esc       = esc_attr( wl_get_entity_uri( $post_id ) );
+            $lod_view_href = 'http://lodview.it/lodview/?IRI=' . $uri_esc;
+            $html .= "<span id='view-post-btn'><a href='$lod_view_href' class='button button-small wl-button' target='_blank'>" .
+                        __( 'View Linked Data', 'wordlift' ) .
+                        "</a></span>\n";
+        }
+        $html .= "<span id='view-post-btn'><a href='" . WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL .
+                    urlencode( get_permalink( $post_id ) ) .
+                    "' class='button button-small wl-button' target='_blank'>" .
+                    __( 'Test Google Rich Snippets', 'wordlift' ) .
+                    "</a></span>\n";
+    }
 
-	return $html;
+    return $html;
 }
 
 add_filter( 'get_sample_permalink_html', 'wl_admin_permalink_html', 10, 4 );
\ No newline at end of file

Spacing +12 added lines, -12 removed lines

@@ -14,25 +14,25 @@
  *
  * @return The enhanced html.
  */
-function wl_admin_permalink_html( $html, $post_id, $new_title, $new_slug ) {
+function wl_admin_permalink_html($html, $post_id, $new_title, $new_slug) {
 
 	// If the post is published, add the button to view Redlink's linked data.
-	if ( 'publish' == get_post_status( $post_id ) ) {
-		if ( $uri = wl_get_entity_uri( $post_id ) ) {
-			$uri_esc       = esc_attr( wl_get_entity_uri( $post_id ) );
-			$lod_view_href = 'http://lodview.it/lodview/?IRI=' . $uri_esc;
-			$html .= "<span id='view-post-btn'><a href='$lod_view_href' class='button button-small wl-button' target='_blank'>" .
-			         __( 'View Linked Data', 'wordlift' ) .
+	if ('publish' == get_post_status($post_id)) {
+		if ($uri = wl_get_entity_uri($post_id)) {
+			$uri_esc       = esc_attr(wl_get_entity_uri($post_id));
+			$lod_view_href = 'http://lodview.it/lodview/?IRI='.$uri_esc;
+			$html .= "<span id='view-post-btn'><a href='$lod_view_href' class='button button-small wl-button' target='_blank'>".
+			         __('View Linked Data', 'wordlift').
 			         "</a></span>\n";
 		}
-		$html .= "<span id='view-post-btn'><a href='" . WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL .
-		         urlencode( get_permalink( $post_id ) ) .
-		         "' class='button button-small wl-button' target='_blank'>" .
-		         __( 'Test Google Rich Snippets', 'wordlift' ) .
+		$html .= "<span id='view-post-btn'><a href='".WL_CONFIG_TEST_GOOGLE_RICH_SNIPPETS_URL.
+		         urlencode(get_permalink($post_id)).
+		         "' class='button button-small wl-button' target='_blank'>".
+		         __('Test Google Rich Snippets', 'wordlift').
 		         "</a></span>\n";
 	}
 
 	return $html;
 }
 
-add_filter( 'get_sample_permalink_html', 'wl_admin_permalink_html', 10, 4 );
\ No newline at end of file
+add_filter('get_sample_permalink_html', 'wl_admin_permalink_html', 10, 4);
\ No newline at end of file

src/modules/core/wordlift_core_post_entity_relations.php

Doc Comments +4 added lines

@@ -266,6 +266,8 @@ 
 * @param int $subject_id The post ID | The entity post ID.
 * @param string $predicate Name of the relation: null | 'what' | 'where' | 'when' | 'who'
 * @param string $post_status Filter by post status null | 'publish' | 'draft' | 'pending' | 'trash'. null means *any* post status
+* @param string $get
+* @param integer $item_id
 *
 * @return (array) Array of ids.
 */
@@ -337,6 +339,8 @@ 
 * @param int $object_id The entity ID or the post ID.
 * @param string $predicate Name of the relation: null | 'what' | 'where' | 'when' | 'who'
 * @param string $post_status Filter by post status null | 'publish' | 'draft' | 'pending' | 'trash'. null means *any* post status
+* @param string $get
+* @param integer $item_id
 *
 * @return (array) Array of objects.
 */

Spacing +88 added lines, -88 removed lines

@@ -7,11 +7,11 @@ 
  * 
  * @return boolean Return true if supported, false otherwise
  */
-function wl_core_check_relation_predicate_is_supported( $predicate ) {
+function wl_core_check_relation_predicate_is_supported($predicate) {
     
-    return in_array( $predicate, array(
+    return in_array($predicate, array(
         WL_WHAT_RELATION, WL_WHEN_RELATION, WL_WHERE_RELATION, WL_WHO_RELATION
-    ) );
+    ));
 }
 /**
  * Return an array of validation rules used by wl_core_get_posts
@@ -20,7 +20,7 @@ 
  */
 function wl_core_get_validation_rules() { 
 
-    return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
+    return unserialize(WL_CORE_GET_POSTS_VALIDATION_RULES);
 }
 /**
  * Return the wordlift relation instances table name
@@ -30,7 +30,7 @@ 
 function wl_core_get_relation_instances_table_name() { 
 
     global $wpdb;
-    $table_name = $wpdb->prefix . WL_DB_RELATION_INSTANCES_TABLE_NAME;
+    $table_name = $wpdb->prefix.WL_DB_RELATION_INSTANCES_TABLE_NAME;
     return $table_name;
 }
 
@@ -44,15 +44,15 @@ 
 * @uses $wpdb->replace() to perform the query
 * @return (integer|boolean) Return then relation instance ID or false
 */
-function wl_core_add_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_add_relation_instance($subject_id, $predicate, $object_id) {
     
     // Checks on subject and object
-    if( !is_numeric( $subject_id ) || !is_numeric( $object_id ) ) {
+    if ( ! is_numeric($subject_id) || ! is_numeric($object_id)) {
         return false;
     }
     
     // Checks on the given relation
-    if( !wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+    if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
         return false;
     }
     
@@ -68,7 +68,7 @@ 
 		'predicate' => $predicate, 
 		'object_id' => $object_id 
 	   ), 
-	   array( '%d', '%s', '%d'	) 
+	   array('%d', '%s', '%d') 
     );
     
     // Return record id
@@ -85,22 +85,22 @@ 
 *
 * @return (boolean) False for failure. True for success.
 */
-function wl_core_delete_relation_instance( $subject_id, $predicate, $object_id ) {
+function wl_core_delete_relation_instance($subject_id, $predicate, $object_id) {
 
     // Checks on subject and object
-    if( !is_numeric( $subject_id ) || !is_numeric( $object_id ) ) {
+    if ( ! is_numeric($subject_id) || ! is_numeric($object_id)) {
         return false;
     }
     
     // Checks on the given relation
-    if( !wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+    if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
         return false;
     }
     
     // Prepare interaction with db
     global $wpdb;
 
-    wl_write_log( "Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]"); 
+    wl_write_log("Going to delete relation instace [ subject_id :: $subject_id ] [ object_id :: $object_id ] [ predicate :: $predicate ]"); 
     
     // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
     $wpdb->delete(
@@ -110,7 +110,7 @@ 
         'predicate' => $predicate, 
         'object_id' => $object_id 
        ), 
-       array( '%d', '%s', '%d'  ) 
+       array('%d', '%s', '%d') 
     );
 
     return true;    
@@ -126,27 +126,27 @@ 
 *
 * @return (integer|boolean) Return the relation instances IDs or false
 */
-function wl_core_add_relation_instances( $subject_id, $predicate, $object_ids ) {
+function wl_core_add_relation_instances($subject_id, $predicate, $object_ids) {
     
     // Checks on subject and object
-    if( !is_numeric( $subject_id ) ) {
+    if ( ! is_numeric($subject_id)) {
         return false;
     }
     
     // Checks on the given relation
-    if( !wl_core_check_relation_predicate_is_supported( $predicate ) ) {
+    if ( ! wl_core_check_relation_predicate_is_supported($predicate)) {
         return false;
     }
     
     // Check $object_ids is an array
-    if( !is_array( $object_ids ) || empty( $object_ids ) ) {
+    if ( ! is_array($object_ids) || empty($object_ids)) {
         return false;
     }
     
     // Call method to check and add each single relation
     $inserted_records_ids = array();
-    foreach ( $object_ids as $object_id ) {
-        $new_record_id = wl_core_add_relation_instance( $subject_id, $predicate, $object_id );
+    foreach ($object_ids as $object_id) {
+        $new_record_id = wl_core_add_relation_instance($subject_id, $predicate, $object_id);
         $inserted_records_ids[] = $new_record_id;
     }
     
@@ -161,10 +161,10 @@ 
 *
 * @return (boolean) False for failure. True for success.
 */
-function wl_core_delete_relation_instances( $subject_id ) {
+function wl_core_delete_relation_instances($subject_id) {
 
     // Checks on subject and object
-    if( !is_numeric( $subject_id ) ) {
+    if ( ! is_numeric($subject_id)) {
         return false;
     }
     
@@ -179,7 +179,7 @@ 
        array( 
         'subject_id' => $subject_id,
        ), 
-       array( '%d' ) 
+       array('%d') 
     );
 
     return true;
@@ -196,16 +196,16 @@ 
  *      'status'    => null
  *  );
  */
-function wl_core_validate_filters_for_related( $filters ) {
+function wl_core_validate_filters_for_related($filters) {
     
-    if( !is_array( $filters ) ) {
+    if ( ! is_array($filters)) {
         $filters = array();
     }
     
-    if( !isset( $filters['predicate'] )) {
+    if ( ! isset($filters['predicate'])) {
         $filters['predicate'] = null;
     }
-    if( !isset( $filters['status'] )) {
+    if ( ! isset($filters['status'])) {
         $filters['status'] = null;
     }
     
@@ -228,11 +228,11 @@ 
 *
 * @return (array) Array of post entity objects.
 */
-function wl_core_get_related_entities( $subject_id, $filters = array() ) {
+function wl_core_get_related_entities($subject_id, $filters = array()) {
     
-    $filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related($filters);
     
-    return wl_core_inner_get_related_entities( "posts", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities("posts", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -251,11 +251,11 @@ 
 *
 * @return (array) Array of post entity objects.
 */
-function wl_core_get_related_entity_ids( $subject_id, $filters = array() ) {
+function wl_core_get_related_entity_ids($subject_id, $filters = array()) {
     
-    $filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related($filters);
     
-    return wl_core_inner_get_related_entities( "post_ids", $subject_id, $filters['predicate'], $filters['status'] );
+    return wl_core_inner_get_related_entities("post_ids", $subject_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -269,16 +269,16 @@ 
 *
 * @return (array) Array of ids.
 */
-function wl_core_inner_get_related_entities( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_entities($get, $item_id, $predicate = null, $post_status = null) {
     
-    if ( $results = wl_core_get_posts( array(
+    if ($results = wl_core_get_posts(array(
         'get'               =>  $get,
         'post_type'         =>  'entity',
         'post_status'       =>  $post_status,
         'related_to'        =>  $item_id, 
         'as'                =>  'object',
         'with_predicate'    =>  $predicate,
-        ) ) ) {
+        ))) {
             return $results;
     }
     // If wl_core_get_posts return false then an empty array is returned
@@ -301,11 +301,11 @@ 
 *
 * @return (array) Array of objects.
 */
-function wl_core_get_related_posts( $object_id, $filters = array() ) {
+function wl_core_get_related_posts($object_id, $filters = array()) {
     
-    $filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related($filters);
     
-    return wl_core_inner_get_related_posts( "posts", $object_id, $filters[ 'predicate' ], $filters[ 'status' ] );
+    return wl_core_inner_get_related_posts("posts", $object_id, $filters['predicate'], $filters['status']);
 }
 /**
 * Find all post ids related to a given $object_id
@@ -322,11 +322,11 @@ 
 * </code>
 * @return (array) Array of objects.
 */
-function wl_core_get_related_post_ids( $object_id, $filters = array() ) {
+function wl_core_get_related_post_ids($object_id, $filters = array()) {
     
-    $filters = wl_core_validate_filters_for_related( $filters );
+    $filters = wl_core_validate_filters_for_related($filters);
     
-    return wl_core_inner_get_related_posts( "post_ids", $object_id, $filters[ 'predicate' ], $filters[ 'status' ] );
+    return wl_core_inner_get_related_posts("post_ids", $object_id, $filters['predicate'], $filters['status']);
 }
 
 /**
@@ -340,35 +340,35 @@ 
 *
 * @return (array) Array of objects.
 */
-function wl_core_inner_get_related_posts( $get, $item_id, $predicate = null, $post_status = null ) {
+function wl_core_inner_get_related_posts($get, $item_id, $predicate = null, $post_status = null) {
 
     // Retrieve the post object
-    $post = get_post( $item_id );
-    if ( null === $post ) {
+    $post = get_post($item_id);
+    if (null === $post) {
         return array();
     }
 
-    if ( "entity" === $post->post_type ) {
-        if ( $results = wl_core_get_posts( array(
+    if ("entity" === $post->post_type) {
+        if ($results = wl_core_get_posts(array(
             'get'               =>  $get,
             'post_type'         =>  'post',
             'post_status'       =>  $post_status,
             'related_to'        =>  $item_id, 
             'as'                =>  'subject',
             'with_predicate'    =>  $predicate,
-        ) ) ) {
+        ))) {
             return $results;
         }
     } else {
-        if ( $results = wl_core_get_posts( array(
+        if ($results = wl_core_get_posts(array(
             'get'               =>  $get,
             'post_type'         =>  'post',
             'post_status'       =>  $post_status,
-            'post__not_in'      =>  array( $item_id ), 
-            'related_to__in'    =>  wl_core_get_related_entity_ids( $post->ID ), 
+            'post__not_in'      =>  array($item_id), 
+            'related_to__in'    =>  wl_core_get_related_entity_ids($post->ID), 
             'as'                =>  'subject',
             'with_predicate'    =>  $predicate,
-        ) ) ) {
+        ))) {
             return $results;
         }
     }
@@ -401,7 +401,7 @@ 
 *
 * @return string | false String representing a sql statement, or false in case of error 
 */
-function wl_core_sql_query_builder( $args ) {
+function wl_core_sql_query_builder($args) {
 
     // Prepare interaction with db
     global $wpdb;
@@ -411,7 +411,7 @@ 
     // Sql Action
     $sql = "SELECT ";
     // Determine what has to be returned depending on 'get' argument value
-    switch ( $args[ 'get' ] ) {
+    switch ($args['get']) {
         case 'posts':
             $sql .= "p.*";
             break;
@@ -421,16 +421,16 @@ 
     }
 
     // If we look for posts related as objects the JOIN has to be done with the object_id column and viceversa
-    $join_column = $args[ 'as' ] . "_id"; 
+    $join_column = $args['as']."_id"; 
         
     $sql .= " FROM $wpdb->posts as p JOIN $table_name as r ON p.id = r.$join_column";
     
     // Sql add post type filter
-    $sql .= $wpdb->prepare( " AND p.post_type = %s AND", $args[ 'post_type' ] );
+    $sql .= $wpdb->prepare(" AND p.post_type = %s AND", $args['post_type']);
     
     // Sql add post status filter
-    if( isset( $args['post_status'] ) && !is_null( $args['post_status'] ) ) {
-        $sql .= $wpdb->prepare( " p.post_status = %s AND", $args[ 'post_status' ] );
+    if (isset($args['post_status']) && ! is_null($args['post_status'])) {
+        $sql .= $wpdb->prepare(" p.post_status = %s AND", $args['post_status']);
     }
     
     // Add filtering conditions
@@ -439,34 +439,34 @@ 
     // If we look for posts related as subject this means that 
     // related_to is reference for an object: object_id is the filtering column
         
-    $filtering_column = ( 'object' == $args[ 'as' ] ) ? "subject_id" : "object_id";
+    $filtering_column = ('object' == $args['as']) ? "subject_id" : "object_id";
         
-    if( isset( $args[ 'related_to' ] ) ) {
-        $sql .= $wpdb->prepare( " r.$filtering_column = %d", $args[ 'related_to' ] );
+    if (isset($args['related_to'])) {
+        $sql .= $wpdb->prepare(" r.$filtering_column = %d", $args['related_to']);
     }
-    if( isset( $args[ 'related_to' ] ) && isset($args[ 'related_to__in' ] ) ) {
+    if (isset($args['related_to']) && isset($args['related_to__in'])) {
         $sql .= " AND";
     }
-    if( isset($args[ 'related_to__in' ] ) ) {
-        $sql .= " r.$filtering_column IN (" . implode(",", $args[ 'related_to__in' ] ) . ")";
+    if (isset($args['related_to__in'])) {
+        $sql .= " r.$filtering_column IN (".implode(",", $args['related_to__in']).")";
     }
-    if( isset( $args[ 'post__not_in' ] ) ) {
-        $sql .= " AND r." . $args[ 'as' ] . "_id NOT IN (" . implode(",", $args[ 'post__not_in' ] ) . ")";
+    if (isset($args['post__not_in'])) {
+        $sql .= " AND r.".$args['as']."_id NOT IN (".implode(",", $args['post__not_in']).")";
     }
-    if( isset( $args[ 'post__in' ] ) ) {
-        $sql .= " AND r." . $args[ 'as' ] . "_id IN (" . implode(",", $args[ 'post__in' ] ) . ")";
+    if (isset($args['post__in'])) {
+        $sql .= " AND r.".$args['as']."_id IN (".implode(",", $args['post__in']).")";
     }
     // Add predicate filter if required
-    if ( isset( $args[ 'with_predicate' ] ) ) {
+    if (isset($args['with_predicate'])) {
         // Sql Inner Join clausole 
-        $sql .= $wpdb->prepare( " AND r.predicate = %s", $args[ 'with_predicate' ] );
+        $sql .= $wpdb->prepare(" AND r.predicate = %s", $args['with_predicate']);
     }
     // Add a group by clousole to avoid duplicated rows
     $sql .= " GROUP BY p.id";
     
-    if ( isset( $args[ 'first' ] ) && is_numeric( $args[ 'first' ] ) ) {
+    if (isset($args['first']) && is_numeric($args['first'])) {
         // Sql Inner Join clausole 
-        $sql .= $wpdb->prepare( " LIMIT %d", $args[ 'first'] );
+        $sql .= $wpdb->prepare(" LIMIT %d", $args['first']);
     }
     // Close sql statement
     $sql .= ";";
@@ -485,10 +485,10 @@ 
 *
 * @return (array) List of WP_Post objects or list of WP_Post ids. False in case of error or invalid params
 */
-function wl_core_get_posts( $args, $returned_type = OBJECT ) {
+function wl_core_get_posts($args, $returned_type = OBJECT) {
 
     // Merge given args with defaults args value
-    $args = array_merge( array(
+    $args = array_merge(array(
         'with_predicate' => null,
         'as' => 'subject',
         'post_type' => 'post',
@@ -498,29 +498,29 @@ 
 
     // Arguments validation rules
     // At least one between related_to and related_to__in has to be set
-    if ( !isset( $args[ 'related_to' ] ) && !isset( $args[ 'related_to__in' ] ) ) {
+    if ( ! isset($args['related_to']) && ! isset($args['related_to__in'])) {
         return false;
     }
-    if ( isset( $args[ 'related_to' ] ) && !is_numeric( $args[ 'related_to' ] ) ) {
+    if (isset($args['related_to']) && ! is_numeric($args['related_to'])) {
         return false;
     }
 
     // The same check is applied to post_in, post__not_in and related_to__in options
     // Only arrays with at least one numeric value are considerad valid
     // The argument value is further sanitized in order to clean up not numeric values
-    foreach ( array( 'post__in', 'post__not_in', 'related_to__in' ) as $option_name ) {
-        if ( isset( $args[ $option_name ] ) ) {
-            if ( !is_array( $args[ $option_name ] ) || 0 == count( array_filter( $args[ $option_name ], "is_numeric" ) ) ) {
+    foreach (array('post__in', 'post__not_in', 'related_to__in') as $option_name) {
+        if (isset($args[$option_name])) {
+            if ( ! is_array($args[$option_name]) || 0 == count(array_filter($args[$option_name], "is_numeric"))) {
                 return false;
             }
             // Sanitize value removing non numeric values from the array
-            $args[ $option_name ] = array_filter( $args[ $option_name ], "is_numeric" );
+            $args[$option_name] = array_filter($args[$option_name], "is_numeric");
         }
     }
     // Performing validation rules
-    foreach ( wl_core_get_validation_rules() as $option_name => $accepeted_values ) {
-        if ( isset( $args[ $option_name ] ) && !is_null( $args[ $option_name ] ) ) {
-            if ( !in_array( $args[ $option_name ], $accepeted_values ) )  {
+    foreach (wl_core_get_validation_rules() as $option_name => $accepeted_values) {
+        if (isset($args[$option_name]) && ! is_null($args[$option_name])) {
+            if ( ! in_array($args[$option_name], $accepeted_values)) {
                 return false;
             }
         }
@@ -529,21 +529,21 @@ 
     // Prepare interaction with db
     global $wpdb;
     // Build sql statement with given arguments
-    $sql_statement = wl_core_sql_query_builder( $args ); 
+    $sql_statement = wl_core_sql_query_builder($args); 
 
     // wl_write_log( "Going to execute sql statement: $sql_statement " );
     // $results = array();
 
     // If ids are required, returns a one-dimensional array containing ids.
     // Otherwise an array of associative arrays representing the post | relation object
-    if ( 'post_ids' == $args[ 'get' ] ) {
+    if ('post_ids' == $args['get']) {
         # See https://codex.wordpress.org/Class_Reference/wpdb#SELECT_a_Column
-        $results = $wpdb->get_col( $sql_statement );
+        $results = $wpdb->get_col($sql_statement);
     } else {
-        $results = $wpdb->get_results( $sql_statement, $returned_type );
+        $results = $wpdb->get_results($sql_statement, $returned_type);
     }
     // If there were an error performing the query then false is returned
-    if ( !empty( $wpdb->last_error ) ) {
+    if ( ! empty($wpdb->last_error)) {
         return false;
     }
     // Finally

Indentation +14 added lines, -14 removed lines

@@ -62,13 +62,13 @@ 
     // Checks passed. Add relation if not exists
     // See https://codex.wordpress.org/Class_Reference/wpdb#REPLACE_row
     $wpdb->replace( 
-	   wl_core_get_relation_instances_table_name(), 
-	   array( 
+        wl_core_get_relation_instances_table_name(), 
+        array( 
         'subject_id' => $subject_id,
-		'predicate' => $predicate, 
-		'object_id' => $object_id 
-	   ), 
-	   array( '%d', '%s', '%d'	) 
+        'predicate' => $predicate, 
+        'object_id' => $object_id 
+        ), 
+        array( '%d', '%s', '%d'	) 
     );
     
     // Return record id
@@ -104,13 +104,13 @@ 
     
     // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
     $wpdb->delete(
-       wl_core_get_relation_instances_table_name(), 
-       array( 
+        wl_core_get_relation_instances_table_name(), 
+        array( 
         'subject_id' => $subject_id,
         'predicate' => $predicate, 
         'object_id' => $object_id 
-       ), 
-       array( '%d', '%s', '%d'  ) 
+        ), 
+        array( '%d', '%s', '%d'  ) 
     );
 
     return true;    
@@ -175,11 +175,11 @@ 
     
     // @see ttps://codex.wordpress.org/it:Riferimento_classi/wpdb#DELETE_di_righe
     $wpdb->delete(
-       wl_core_get_relation_instances_table_name(), 
-       array( 
+        wl_core_get_relation_instances_table_name(), 
+        array( 
         'subject_id' => $subject_id,
-       ), 
-       array( '%d' ) 
+        ), 
+        array( '%d' ) 
     );
 
     return true;

src/modules/core/wordlift_core_schema_api.php

Doc Comments +2 added lines, -2 removed lines

@@ -170,9 +170,9 @@
  * Sets the entity type(s) for the specified post ID. Support is now for only one type per entity.
  *
  * @param $post_id numeric The numeric post ID
- * @param $type_names array An array of strings, each defining a type (e.g. Type, for the http://schema.org/Type)
+ * @param string $type_names array An array of strings, each defining a type (e.g. Type, for the http://schema.org/Type)
  *
- * @return boolean True if everything went ok, an error string otherwise.
+ * @return boolean|null True if everything went ok, an error string otherwise.
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 

Indentation +116 added lines, -116 removed lines

@@ -10,28 +10,28 @@ 
  */
 function wl_schema_reset_value( $post_id, $property_name ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
-		return FALSE;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
+        return FALSE;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			delete_post_meta( $post_id, $wl_constant );
+            delete_post_meta( $post_id, $wl_constant );
 
-			return TRUE;
-		}
-	}
+            return TRUE;
+        }
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 /**
@@ -44,34 +44,34 @@ 
  */
 function wl_schema_get_value( $post_id, $property_name ) {
 
-	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
-		return NULL;
-	}
-
-	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
-
-	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
-			return NULL;
-		}
-	}
-
-	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
-	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
-		}
-	}
-
-	return NULL;
+    // Property name must be defined.
+    if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+        return NULL;
+    }
+
+    // store eventual schema name in  different variable
+    $property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+
+    // Establish entity id.
+    if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+        $post_id = get_the_ID();
+        if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+            return NULL;
+        }
+    }
+
+    // Get custom fields.
+    $term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Search for the required meta value (by constant name or schema name)
+    foreach ( $term_mapping as $wl_constant => $property_info ) {
+        $found_constant  = ( $wl_constant == $property_name );
+        $found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
+        if ( $found_constant || $found_predicate ) {
+            return get_post_meta( $post_id, $wl_constant );
+        }
+    }
+
+    return NULL;
 }
 
 /**
@@ -85,15 +85,15 @@ 
  */
 function wl_schema_add_value( $post_id, $property_name, $property_value ) {
 
-	if ( ! is_array( $property_value ) ) {
-		$property_value = array( $property_value );
-	}
+    if ( ! is_array( $property_value ) ) {
+        $property_value = array( $property_value );
+    }
 
-	$old_values = wl_schema_get_value( $post_id, $property_name );
+    $old_values = wl_schema_get_value( $post_id, $property_name );
 
-	$merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
+    $merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
 
-	wl_schema_set_value( $post_id, $property_name, $merged_property_value );
+    wl_schema_set_value( $post_id, $property_name, $merged_property_value );
 }
 
 /**
@@ -107,38 +107,38 @@ 
  */
 function wl_schema_set_value( $post_id, $property_name, $property_value ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
-		return FALSE;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+        return FALSE;
+    }
 
-	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+    // Build full schema uri if necessary
+    $property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
 
-	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+    // Get accepted properties
+    $accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
 
-	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+    // Find the name of the custom-field managing the schema property
+    foreach ( $accepted_fields as $wl_constant => $field ) {
+        if ( $field['predicate'] == $property_name ) {
 
-			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
-			}
+            // Deal with single values
+            if ( ! is_array( $property_value ) ) {
+                $property_value = array( $property_value );
+            }
 
-			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+            // Delete present meta
+            delete_post_meta( $post_id, $wl_constant );
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
-			}
+            foreach ( $property_value as $value ) {
+                add_post_meta( $post_id, $wl_constant, $value );
+            }
 
-			return TRUE;
-		}
-	}
+            return TRUE;
+        }
+    }
 
-	return FALSE;
+    return FALSE;
 }
 
 
@@ -152,18 +152,18 @@ 
  */
 function wl_schema_get_types( $post_id ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
-		return NULL;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) ) {
+        return NULL;
+    }
 
-	$type = wl_entity_type_taxonomy_get_type( $post_id );
+    $type = wl_entity_type_taxonomy_get_type( $post_id );
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
-	}
+    if ( isset( $type['uri'] ) ) {
+        return array( $type['uri'] );
+    }
 
-	return NULL;
+    return NULL;
 }
 
 /**
@@ -176,24 +176,24 @@ 
  */
 function wl_schema_set_types( $post_id, $type_names ) {
 
-	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
-		return NULL;
-	}
+    // Some checks on the parameters
+    if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+        return NULL;
+    }
 
-	// TODO: support more than one type
-	if ( is_array( $type_names ) ) {
-		$type_names = $type_names[0];
-	}
+    // TODO: support more than one type
+    if ( is_array( $type_names ) ) {
+        $type_names = $type_names[0];
+    }
 
-	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+    // Get the schema URI (e.g. http://schema.org/Thing)
+    $type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
 
-	Wordlift_Log_Service::get_logger( 'wl_schema_set_types' )
-	                    ->debug( "[ type names :: $type_names ]" );
+    Wordlift_Log_Service::get_logger( 'wl_schema_set_types' )
+                        ->debug( "[ type names :: $type_names ]" );
 
-	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+    // Actually sets the taxonomy type
+    wl_set_entity_main_type( $post_id, $type_names );
 
 }
 
@@ -209,24 +209,24 @@ 
  */
 function wl_schema_get_type_properties( $type_name ) {
 
-	// Build full schema uri if necessary
-	$type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
+    // Build full schema uri if necessary
+    $type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
 
-	// Get all custom fields
-	$all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
+    // Get all custom fields
+    $all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
 
-	$schema_root_address = 'http://schema.org/';
-	$type_properties     = array();
+    $schema_root_address = 'http://schema.org/';
+    $type_properties     = array();
 
-	// Search for the entity type which has the requested name as uri
-	if ( isset( $all_types_and_fields[ $type_name ] ) ) {
-		foreach ( $all_types_and_fields[ $type_name ] as $field ) {
-			// Convert to schema slug and store in array
-			$type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
-		}
-	}
+    // Search for the entity type which has the requested name as uri
+    if ( isset( $all_types_and_fields[ $type_name ] ) ) {
+        foreach ( $all_types_and_fields[ $type_name ] as $field ) {
+            // Convert to schema slug and store in array
+            $type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
+        }
+    }
 
-	return $type_properties;
+    return $type_properties;
 }
 
 /**
@@ -238,11 +238,11 @@ 
  */
 function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
 
-	$schema_root_address = 'http://schema.org/';
+    $schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === FALSE ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
-	}
+    if ( strpos( $schema_name, $schema_root_address ) === FALSE ) {   // === necessary
+        $schema_name = $schema_root_address . $schema_name;
+    }
 
-	return $schema_name;
+    return $schema_name;
 }
\ No newline at end of file

Spacing +55 added lines, -55 removed lines

@@ -8,24 +8,24 @@ 
  *
  * @return boolean The method returns true if everything went ok, false otherwise.
  */
-function wl_schema_reset_value( $post_id, $property_name ) {
+function wl_schema_reset_value($post_id, $property_name) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) ) {
+	if ( ! is_numeric($post_id) || is_null($property_name)) {
 		return FALSE;
 	}
 
 	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$accepted_fields = wl_entity_taxonomy_get_custom_fields($post_id);
 
 	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+	foreach ($accepted_fields as $wl_constant => $field) {
+		if ($field['predicate'] == $property_name) {
 
-			delete_post_meta( $post_id, $wl_constant );
+			delete_post_meta($post_id, $wl_constant);
 
 			return TRUE;
 		}
@@ -42,32 +42,32 @@ 
  *
  * @return array An array of values or NULL in case of no values (or error).
  */
-function wl_schema_get_value( $post_id, $property_name ) {
+function wl_schema_get_value($post_id, $property_name) {
 
 	// Property name must be defined.
-	if ( ! isset( $property_name ) || is_null( $property_name ) ) {
+	if ( ! isset($property_name) || is_null($property_name)) {
 		return NULL;
 	}
 
 	// store eventual schema name in  different variable
-	$property_schema_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_schema_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Establish entity id.
-	if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+	if (is_null($post_id) || ! is_numeric($post_id)) {
 		$post_id = get_the_ID();
-		if ( is_null( $post_id ) || ! is_numeric( $post_id ) ) {
+		if (is_null($post_id) || ! is_numeric($post_id)) {
 			return NULL;
 		}
 	}
 
 	// Get custom fields.
-	$term_mapping = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$term_mapping = wl_entity_taxonomy_get_custom_fields($post_id);
 	// Search for the required meta value (by constant name or schema name)
-	foreach ( $term_mapping as $wl_constant => $property_info ) {
-		$found_constant  = ( $wl_constant == $property_name );
-		$found_predicate = ( isset( $property_info['predicate'] ) && $property_info['predicate'] == $property_schema_name );
-		if ( $found_constant || $found_predicate ) {
-			return get_post_meta( $post_id, $wl_constant );
+	foreach ($term_mapping as $wl_constant => $property_info) {
+		$found_constant  = ($wl_constant == $property_name);
+		$found_predicate = (isset($property_info['predicate']) && $property_info['predicate'] == $property_schema_name);
+		if ($found_constant || $found_predicate) {
+			return get_post_meta($post_id, $wl_constant);
 		}
 	}
 
@@ -83,17 +83,17 @@ 
  *
  * @return array An array of values or NULL in case of no values (or error).
  */
-function wl_schema_add_value( $post_id, $property_name, $property_value ) {
+function wl_schema_add_value($post_id, $property_name, $property_value) {
 
-	if ( ! is_array( $property_value ) ) {
-		$property_value = array( $property_value );
+	if ( ! is_array($property_value)) {
+		$property_value = array($property_value);
 	}
 
-	$old_values = wl_schema_get_value( $post_id, $property_name );
+	$old_values = wl_schema_get_value($post_id, $property_name);
 
-	$merged_property_value = array_unique( array_merge( $property_value, $old_values ) );
+	$merged_property_value = array_unique(array_merge($property_value, $old_values));
 
-	wl_schema_set_value( $post_id, $property_name, $merged_property_value );
+	wl_schema_set_value($post_id, $property_name, $merged_property_value);
 }
 
 /**
@@ -105,33 +105,33 @@ 
  *
  * @return boolean The method returns true if everything went ok, an error string otherwise.
  */
-function wl_schema_set_value( $post_id, $property_name, $property_value ) {
+function wl_schema_set_value($post_id, $property_name, $property_value) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || is_null( $property_name ) || empty( $property_value ) || is_null( $property_value ) ) {
+	if ( ! is_numeric($post_id) || is_null($property_name) || empty($property_value) || is_null($property_value)) {
 		return FALSE;
 	}
 
 	// Build full schema uri if necessary
-	$property_name = wl_build_full_schema_uri_from_schema_slug( $property_name );
+	$property_name = wl_build_full_schema_uri_from_schema_slug($property_name);
 
 	// Get accepted properties
-	$accepted_fields = wl_entity_taxonomy_get_custom_fields( $post_id );
+	$accepted_fields = wl_entity_taxonomy_get_custom_fields($post_id);
 
 	// Find the name of the custom-field managing the schema property
-	foreach ( $accepted_fields as $wl_constant => $field ) {
-		if ( $field['predicate'] == $property_name ) {
+	foreach ($accepted_fields as $wl_constant => $field) {
+		if ($field['predicate'] == $property_name) {
 
 			// Deal with single values
-			if ( ! is_array( $property_value ) ) {
-				$property_value = array( $property_value );
+			if ( ! is_array($property_value)) {
+				$property_value = array($property_value);
 			}
 
 			// Delete present meta
-			delete_post_meta( $post_id, $wl_constant );
+			delete_post_meta($post_id, $wl_constant);
 
-			foreach ( $property_value as $value ) {
-				add_post_meta( $post_id, $wl_constant, $value );
+			foreach ($property_value as $value) {
+				add_post_meta($post_id, $wl_constant, $value);
 			}
 
 			return TRUE;
@@ -150,17 +150,17 @@ 
  * @return array Array of type(s) (e.g. Type, for the http://schema.org/Type)
  * or NULL in case of no values (or error).
  */
-function wl_schema_get_types( $post_id ) {
+function wl_schema_get_types($post_id) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) ) {
+	if ( ! is_numeric($post_id)) {
 		return NULL;
 	}
 
-	$type = wl_entity_type_taxonomy_get_type( $post_id );
+	$type = wl_entity_type_taxonomy_get_type($post_id);
 
-	if ( isset( $type['uri'] ) ) {
-		return array( $type['uri'] );
+	if (isset($type['uri'])) {
+		return array($type['uri']);
 	}
 
 	return NULL;
@@ -174,26 +174,26 @@ 
  *
  * @return boolean True if everything went ok, an error string otherwise.
  */
-function wl_schema_set_types( $post_id, $type_names ) {
+function wl_schema_set_types($post_id, $type_names) {
 
 	// Some checks on the parameters
-	if ( ! is_numeric( $post_id ) || empty( $type_names ) || is_null( $type_names ) ) {
+	if ( ! is_numeric($post_id) || empty($type_names) || is_null($type_names)) {
 		return NULL;
 	}
 
 	// TODO: support more than one type
-	if ( is_array( $type_names ) ) {
+	if (is_array($type_names)) {
 		$type_names = $type_names[0];
 	}
 
 	// Get the schema URI (e.g. http://schema.org/Thing)
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+	$type_names = wl_build_full_schema_uri_from_schema_slug($type_names);
 
-	Wordlift_Log_Service::get_logger( 'wl_schema_set_types' )
-	                    ->debug( "[ type names :: $type_names ]" );
+	Wordlift_Log_Service::get_logger('wl_schema_set_types')
+	                    ->debug("[ type names :: $type_names ]");
 
 	// Actually sets the taxonomy type
-	wl_set_entity_main_type( $post_id, $type_names );
+	wl_set_entity_main_type($post_id, $type_names);
 
 }
 
@@ -207,10 +207,10 @@ 
  * @return array The method returns an array of supported properties for the type, e.g. (‘startDate’, ‘endDate’) for an Event.
  * You can call wl_schema_get_property_expected_type on each to know which data type they expect.
  */
-function wl_schema_get_type_properties( $type_name ) {
+function wl_schema_get_type_properties($type_name) {
 
 	// Build full schema uri if necessary
-	$type_name = wl_build_full_schema_uri_from_schema_slug( $type_name );
+	$type_name = wl_build_full_schema_uri_from_schema_slug($type_name);
 
 	// Get all custom fields
 	$all_types_and_fields = wl_entity_taxonomy_get_custom_fields();
@@ -219,10 +219,10 @@ 
 	$type_properties     = array();
 
 	// Search for the entity type which has the requested name as uri
-	if ( isset( $all_types_and_fields[ $type_name ] ) ) {
-		foreach ( $all_types_and_fields[ $type_name ] as $field ) {
+	if (isset($all_types_and_fields[$type_name])) {
+		foreach ($all_types_and_fields[$type_name] as $field) {
 			// Convert to schema slug and store in array
-			$type_properties[] = str_replace( $schema_root_address, '', $field['predicate'] );
+			$type_properties[] = str_replace($schema_root_address, '', $field['predicate']);
 		}
 	}
 
@@ -236,12 +236,12 @@ 
  *
  * @return string The full schema uri (es. 'latitude' returns 'http://schema.org/latitude')
  */
-function wl_build_full_schema_uri_from_schema_slug( $schema_name ) {
+function wl_build_full_schema_uri_from_schema_slug($schema_name) {
 
 	$schema_root_address = 'http://schema.org/';
 
-	if ( strpos( $schema_name, $schema_root_address ) === FALSE ) {   // === necessary
-		$schema_name = $schema_root_address . $schema_name;
+	if (strpos($schema_name, $schema_root_address) === FALSE) {   // === necessary
+		$schema_name = $schema_root_address.$schema_name;
 	}
 
 	return $schema_name;

src/shortcodes/wordlift_shortcode_geomap.php

Doc Comments -1 removed lines

@@ -160,7 +160,6 @@
  * @uses wl_shortcode_geomap_get_places() in order to retrieve places
  * @uses wl_shortcode_geomap_prepare_map() in order to encode retireved places in a Leaflet friendly format
  *
- * @param array $places An array of place posts.
  *
  * @return array An array of place posts.
  */

Indentation +119 added lines, -119 removed lines

@@ -14,56 +14,56 @@ 
  */
 function wl_shortcode_geomap_get_places( $post_id = null ) {
 
-	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+    // If $post_id is null or is not numeric it means this is a global geomap
+    $is_global = is_null( $post_id ) || ! is_numeric( $post_id );
 
-	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
-		$related_ids = array();
-	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
-			'status' => 'publish'
-		) );
+    // If the current one is not a global geomap, retrieve related entities ids
+    if ( $is_global ) {
+        $related_ids = array();
+    } else {
+        $related_ids = wl_core_get_related_entity_ids( $post_id, array(
+            'status' => 'publish'
+        ) );
 		
-		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$related_ids[] = $post_id;
-		}
-	}
+        // Also include current entity
+        if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $related_ids[] = $post_id;
+        }
+    }
 
-	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
-	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
-		return array();
-	}
+    // If is not a global geomap, an empty $related_ids means that no entities are related to the post
+    // An empty array can be returned in this case
+    if ( ! $is_global && empty( $related_ids ) ) {
+        return array();
+    }
 
-	// Retrieve all 'published' places with geo coordinates defined
-	// If $related_ids is not empty, it's used to limit query results to the current post related places
-	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
-		'post__in'    => $related_ids,
-		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-		'nopaging'    => true,
-		'post_status' => 'publish',
-		'meta_query'  => array(
-			'relation' => 'AND',
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			),
-			array(
-				'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
-				'value'   => null,
-				'compare' => '!=',
-			)
-		),
-		'tax_query'      => array(
-			'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
-			'field'    => 'slug',
-			'terms'    => 'place'
-		)
-	) );
+    // Retrieve all 'published' places with geo coordinates defined
+    // If $related_ids is not empty, it's used to limit query results to the current post related places
+    // Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
+    return get_posts( array(
+        'post__in'    => $related_ids,
+        'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+        'nopaging'    => true,
+        'post_status' => 'publish',
+        'meta_query'  => array(
+            'relation' => 'AND',
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LATITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            ),
+            array(
+                'key'     => Wordlift_Schema_Service::FIELD_GEO_LONGITUDE,
+                'value'   => null,
+                'compare' => '!=',
+            )
+        ),
+        'tax_query'      => array(
+            'taxonomy' => Wordlift_Entity_Types_Taxonomy_Service::TAXONOMY_NAME,
+            'field'    => 'slug',
+            'terms'    => 'place'
+        )
+    ) );
 }
 
 /**
@@ -78,88 +78,88 @@ 
  */
 function wl_shortcode_geomap_prepare_map( $places ) {
 
-	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
-	$min_latitude  = PHP_INT_MAX;
-	$min_longitude = PHP_INT_MAX;
-	$max_latitude  = ~PHP_INT_MAX;
-	$max_longitude = ~PHP_INT_MAX;
+    // Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
+    $min_latitude  = PHP_INT_MAX;
+    $min_longitude = PHP_INT_MAX;
+    $max_latitude  = ~PHP_INT_MAX;
+    $max_longitude = ~PHP_INT_MAX;
 
-	// Prepare an empty array of POIs in geoJSON format.
-	$pois = array();
-	// And store list of points to allow Leaflet compute the optimal bounding box.
-	// The main reason for this is that geoJSON has swapped coordinates (lon. lat)
-	$boundaries = array();
+    // Prepare an empty array of POIs in geoJSON format.
+    $pois = array();
+    // And store list of points to allow Leaflet compute the optimal bounding box.
+    // The main reason for this is that geoJSON has swapped coordinates (lon. lat)
+    $boundaries = array();
 
-	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+    // Add a POI for each entity that has coordinates.
+    foreach ( $places as $entity ) {
 
-		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+        // Get the coordinates.
+        $coordinates = wl_get_coordinates( $entity->ID );
 
-		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
-			continue;
-		}
+        // Don't show the widget if the coordinates aren't set.
+        if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+            continue;
+        }
 
-		// TODO Map html rendering should be delegated to the wordlift js ui layer
-		// This function should be focused on returning pure data instead
+        // TODO Map html rendering should be delegated to the wordlift js ui layer
+        // This function should be focused on returning pure data instead
 
-		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-		) {
-			$img_src = esc_attr( $attachment[0] );
-		}
+        // Get the title, URL and thumb of the entity.
+        $title = esc_attr( $entity->post_title );
+        $link  = esc_attr( get_permalink( $entity->ID ) );
+        if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
+             false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+        ) {
+            $img_src = esc_attr( $attachment[0] );
+        }
 
-		// Build HTML popup. TODO: move thumb width in css
-		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
-		}
-		$content = $content . "</a><ul>";
-		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
-			'status' => 'publish'
-		) );
-		foreach ( $related_posts as $rp_id ) {
+        // Build HTML popup. TODO: move thumb width in css
+        $content = "<a href=$link><h6>$title</h6>";
+        if ( isset( $img_src ) ) {
+            $content = $content . "<img src=$img_src style='width:100%'/>";
+        }
+        $content = $content . "</a><ul>";
+        // Get the related posts (published) and print them in the popup.
+        $related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+            'status' => 'publish'
+        ) );
+        foreach ( $related_posts as $rp_id ) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
-		}
-		$content = $content . "</ul>";
+            $rp      = get_post( $rp_id );
+            $title   = esc_attr( $rp->post_title );
+            $link    = esc_attr( get_permalink( $rp->ID ) );
+            $content = $content . "<li><a href=$link>$title</a></li>";
+        }
+        $content = $content . "</ul>";
 
-		// Formatting POI in geoJSON.
-		// http://leafletjs.com/examples/geojson.html
-		$poi = array(
-			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
-			'geometry'   => array(
-				'type'        => 'Point',
-				'coordinates' => array(
-					// Leaflet geoJSON wants them swapped
-					$coordinates['longitude'],
-					$coordinates['latitude']
-				)
-			)
-		);
+        // Formatting POI in geoJSON.
+        // http://leafletjs.com/examples/geojson.html
+        $poi = array(
+            'type'       => 'Feature',
+            'properties' => array( 'popupContent' => $content ),
+            'geometry'   => array(
+                'type'        => 'Point',
+                'coordinates' => array(
+                    // Leaflet geoJSON wants them swapped
+                    $coordinates['longitude'],
+                    $coordinates['latitude']
+                )
+            )
+        );
 
-		$pois[] = $poi;
+        $pois[] = $poi;
 
-		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
-		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
+        // Formatting boundaries in a Leaflet-like format (see LatLngBounds).
+        // http://leafletjs.com/reference.html#latlngbounds
+        $boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
 
-	}
+    }
 
-	$map_data               = array();
-	$map_data['features']   = $pois;
-	$map_data['boundaries'] = $boundaries;
+    $map_data               = array();
+    $map_data['features']   = $pois;
+    $map_data['boundaries'] = $boundaries;
 
-	return $map_data;
+    return $map_data;
 }
 
 /**
@@ -173,13 +173,13 @@ 
  * @return array An array of place posts.
  */
 function wl_shortcode_geomap_ajax() {
-	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+    // Get the post Id.
+    $post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+    $places   = wl_shortcode_geomap_get_places( $post_id );
+    $map_data = wl_shortcode_geomap_prepare_map( $places );
 
-	wl_core_send_json( $map_data );
+    wl_core_send_json( $map_data );
 }
 
 add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );

Spacing +37 added lines, -37 removed lines

@@ -12,35 +12,35 @@ 
  *
  * @return array An array of place posts.
  */
-function wl_shortcode_geomap_get_places( $post_id = null ) {
+function wl_shortcode_geomap_get_places($post_id = null) {
 
 	// If $post_id is null or is not numeric it means this is a global geomap
-	$is_global = is_null( $post_id ) || ! is_numeric( $post_id );
+	$is_global = is_null($post_id) || ! is_numeric($post_id);
 
 	// If the current one is not a global geomap, retrieve related entities ids
-	if ( $is_global ) {
+	if ($is_global) {
 		$related_ids = array();
 	} else {
-		$related_ids = wl_core_get_related_entity_ids( $post_id, array(
+		$related_ids = wl_core_get_related_entity_ids($post_id, array(
 			'status' => 'publish'
-		) );
+		));
 		
 		// Also include current entity
-		if ( Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$related_ids[] = $post_id;
 		}
 	}
 
 	// If is not a global geomap, an empty $related_ids means that no entities are related to the post
 	// An empty array can be returned in this case
-	if ( ! $is_global && empty( $related_ids ) ) {
+	if ( ! $is_global && empty($related_ids)) {
 		return array();
 	}
 
 	// Retrieve all 'published' places with geo coordinates defined
 	// If $related_ids is not empty, it's used to limit query results to the current post related places
 	// Please note that when $place_ids is an empty array, the 'post__in' parameter is not considered in the query
-	return get_posts( array(
+	return get_posts(array(
 		'post__in'    => $related_ids,
 		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
 		'nopaging'    => true,
@@ -63,7 +63,7 @@ 
 			'field'    => 'slug',
 			'terms'    => 'place'
 		)
-	) );
+	));
 }
 
 /**
@@ -76,7 +76,7 @@ 
  *
  * @return array An array of markers and boundaries for Leaflet.
  */
-function wl_shortcode_geomap_prepare_map( $places ) {
+function wl_shortcode_geomap_prepare_map($places) {
 
 	// Prepare for min/max lat/long in case we need to define a view boundary for the client JavaScript.
 	$min_latitude  = PHP_INT_MAX;
@@ -91,13 +91,13 @@ 
 	$boundaries = array();
 
 	// Add a POI for each entity that has coordinates.
-	foreach ( $places as $entity ) {
+	foreach ($places as $entity) {
 
 		// Get the coordinates.
-		$coordinates = wl_get_coordinates( $entity->ID );
+		$coordinates = wl_get_coordinates($entity->ID);
 
 		// Don't show the widget if the coordinates aren't set.
-		if ( $coordinates['latitude'] == 0 || $coordinates['longitude'] == 0 ) {
+		if ($coordinates['latitude'] == 0 || $coordinates['longitude'] == 0) {
 			continue;
 		}
 
@@ -105,38 +105,38 @@ 
 		// This function should be focused on returning pure data instead
 
 		// Get the title, URL and thumb of the entity.
-		$title = esc_attr( $entity->post_title );
-		$link  = esc_attr( get_permalink( $entity->ID ) );
-		if ( '' !== ( $thumbnail_id = get_post_thumbnail_id( $entity->ID ) ) &&
-		     false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+		$title = esc_attr($entity->post_title);
+		$link  = esc_attr(get_permalink($entity->ID));
+		if ('' !== ($thumbnail_id = get_post_thumbnail_id($entity->ID)) &&
+		     false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 		) {
-			$img_src = esc_attr( $attachment[0] );
+			$img_src = esc_attr($attachment[0]);
 		}
 
 		// Build HTML popup. TODO: move thumb width in css
 		$content = "<a href=$link><h6>$title</h6>";
-		if ( isset( $img_src ) ) {
-			$content = $content . "<img src=$img_src style='width:100%'/>";
+		if (isset($img_src)) {
+			$content = $content."<img src=$img_src style='width:100%'/>";
 		}
-		$content = $content . "</a><ul>";
+		$content = $content."</a><ul>";
 		// Get the related posts (published) and print them in the popup.
-		$related_posts = wl_core_get_related_post_ids( $entity->ID, array(
+		$related_posts = wl_core_get_related_post_ids($entity->ID, array(
 			'status' => 'publish'
-		) );
-		foreach ( $related_posts as $rp_id ) {
+		));
+		foreach ($related_posts as $rp_id) {
 
-			$rp      = get_post( $rp_id );
-			$title   = esc_attr( $rp->post_title );
-			$link    = esc_attr( get_permalink( $rp->ID ) );
-			$content = $content . "<li><a href=$link>$title</a></li>";
+			$rp      = get_post($rp_id);
+			$title   = esc_attr($rp->post_title);
+			$link    = esc_attr(get_permalink($rp->ID));
+			$content = $content."<li><a href=$link>$title</a></li>";
 		}
-		$content = $content . "</ul>";
+		$content = $content."</ul>";
 
 		// Formatting POI in geoJSON.
 		// http://leafletjs.com/examples/geojson.html
 		$poi = array(
 			'type'       => 'Feature',
-			'properties' => array( 'popupContent' => $content ),
+			'properties' => array('popupContent' => $content),
 			'geometry'   => array(
 				'type'        => 'Point',
 				'coordinates' => array(
@@ -151,7 +151,7 @@ 
 
 		// Formatting boundaries in a Leaflet-like format (see LatLngBounds).
 		// http://leafletjs.com/reference.html#latlngbounds
-		$boundaries[] = array( $coordinates['latitude'], $coordinates['longitude'] );
+		$boundaries[] = array($coordinates['latitude'], $coordinates['longitude']);
 
 	}
 
@@ -174,16 +174,16 @@ 
  */
 function wl_shortcode_geomap_ajax() {
 	// Get the post Id.
-	$post_id = ( isset( $_REQUEST['post_id'] ) ? $_REQUEST['post_id'] : null );
+	$post_id = (isset($_REQUEST['post_id']) ? $_REQUEST['post_id'] : null);
 
-	$places   = wl_shortcode_geomap_get_places( $post_id );
-	$map_data = wl_shortcode_geomap_prepare_map( $places );
+	$places   = wl_shortcode_geomap_get_places($post_id);
+	$map_data = wl_shortcode_geomap_prepare_map($places);
 
-	wl_core_send_json( $map_data );
+	wl_core_send_json($map_data);
 }
 
-add_action( 'wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax' );
-add_action( 'wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax' );
+add_action('wp_ajax_wl_geomap', 'wl_shortcode_geomap_ajax');
+add_action('wp_ajax_nopriv_wl_geomap', 'wl_shortcode_geomap_ajax');
 
 ///**
 // * Print geomap shortcode

src/wordlift.php

Doc Comments +1 added lines, -1 removed lines

@@ -93,7 +93,7 @@
  *
  * @since 3.0.0
  *
- * @param $text string A text that may potentially contain a WL key.
+ * @param string $text string A text that may potentially contain a WL key.
  *
  * @return string A text with the key hidden.
  */

Indentation +249 added lines, -249 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -47,18 +47,18 @@ 
  */
 function wl_write_log( $log ) {
 
-	$handler = apply_filters( 'wl_write_log_handler', NULL );
+    $handler = apply_filters( 'wl_write_log_handler', NULL );
 
-	$callers         = debug_backtrace();
-	$caller_function = $callers[1]['function'];
+    $callers         = debug_backtrace();
+    $caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+    if ( is_null( $handler ) ) {
+        wl_write_log_handler( $log, $caller_function );
 
-		return;
-	}
+        return;
+    }
 
-	call_user_func( $handler, $log, $caller_function );
+    call_user_func( $handler, $log, $caller_function );
 }
 
 /**
@@ -71,20 +71,20 @@ 
  */
 function wl_write_log_handler( $log, $caller = NULL ) {
 
-	global $wl_logger;
+    global $wl_logger;
 
-	if ( TRUE === WP_DEBUG ) {
+    if ( TRUE === WP_DEBUG ) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, TRUE ) : wl_write_log_hide_key( $log ) );
+        $message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
+                    ( is_array( $log ) || is_object( $log ) ? print_r( $log, TRUE ) : wl_write_log_hide_key( $log ) );
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
-		} else {
-			error_log( $message );
-		}
+        if ( isset( $wl_logger ) ) {
+            $wl_logger->info( $message );
+        } else {
+            error_log( $message );
+        }
 
-	}
+    }
 
 }
 
@@ -99,7 +99,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -111,10 +111,10 @@ 
  */
 function wl_queue_sparql_update_query( $query ) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    file_put_contents( $filename, $query . "\n", FILE_APPEND );
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
 }
 
 /**
@@ -124,28 +124,28 @@ 
  */
 function wl_execute_saved_sparql_update_query( $request_id ) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+    $filename = WL_TEMP_DIR . $request_id . '.sparql';
 
-	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+    // If the file doesn't exist, exit.
+    if ( ! file_exists( $filename ) ) {
+        wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
 
-		return;
-	}
+        return;
+    }
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
 
-	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+    // Get the query saved in the file.
+    $query = file_get_contents( $filename );
 
-	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, FALSE );
+    // Execute the SPARQL query.
+    rl_execute_sparql_update_query( $query, FALSE );
 
-	// Reindex the triple store.
-	wordlift_reindex_triple_store();
+    // Reindex the triple store.
+    wordlift_reindex_triple_store();
 
-	// Delete the temporary file.
-	unlink( $filename );
+    // Delete the temporary file.
+    unlink( $filename );
 }
 
 add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
@@ -155,10 +155,10 @@ 
  */
 function wordlift_buttonhooks() {
 
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+    }
 }
 
 /**
@@ -170,11 +170,11 @@ 
  */
 function wordlift_register_tinymce_javascript( $plugin_array ) {
 
-	// add the wordlift plugin.
-	// We can't use the minified version here.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+    // add the wordlift plugin.
+    // We can't use the minified version here.
+    $plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
 
-	return $plugin_array;
+    return $plugin_array;
 }
 
 /**
@@ -182,21 +182,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array(),
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array(),
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // init process for button control
@@ -210,28 +210,28 @@ 
  */
 function wordlift_admin_enqueue_scripts() {
 
-	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+    // Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
+    wp_enqueue_script( 'wpdialogs' );
+    wp_enqueue_style( 'wp-jquery-ui-dialog' );
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+    wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-	wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
+    wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
+    wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
+    wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
 
-	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
-	}
+    // Disable auto-save for custom entity posts only
+    if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
+        wp_dequeue_script( 'autosave' );
+    }
 }
 
 add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+    wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
 }
 
 add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
@@ -246,18 +246,18 @@ 
  */
 function wordlift_allowed_html( $allowedtags, $context ) {
 
-	if ( 'post' !== $context ) {
-		return $allowedtags;
-	}
-
-	return array_merge_recursive( $allowedtags, array(
-		'span' => array(
-			'itemscope' => TRUE,
-			'itemtype'  => TRUE,
-			'itemid'    => TRUE,
-			'itemprop'  => TRUE,
-		),
-	) );
+    if ( 'post' !== $context ) {
+        return $allowedtags;
+    }
+
+    return array_merge_recursive( $allowedtags, array(
+        'span' => array(
+            'itemscope' => TRUE,
+            'itemtype'  => TRUE,
+            'itemid'    => TRUE,
+            'itemprop'  => TRUE,
+        ),
+    ) );
 }
 
 add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
@@ -271,15 +271,15 @@ 
  */
 function wl_get_coordinates( $post_id ) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+    $latitude  = wl_schema_get_value( $post_id, 'latitude' );
+    $longitude = wl_schema_get_value( $post_id, 'longitude' );
 
-	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
-	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
-	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
-	);
+    // DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
+    // "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
+    return array(
+        'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
+        'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : '',
+    );
 }
 
 /**
@@ -291,13 +291,13 @@ 
  */
 function wl_get_post_modified_time( $post ) {
 
-	$date_modified = get_post_modified_time( 'c', TRUE, $post );
+    $date_modified = get_post_modified_time( 'c', TRUE, $post );
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
-	}
+    if ( '-' === substr( $date_modified, 0, 1 ) ) {
+        return get_the_time( 'c', $post );
+    }
 
-	return $date_modified;
+    return $date_modified;
 }
 
 /**
@@ -310,42 +310,42 @@ 
 function wl_get_image_urls( $post_id ) {
 
 
-	// If there is a featured image it has the priority
-	$featured_image_id = get_post_thumbnail_id( $post_id );
-	if ( is_numeric( $featured_image_id ) ) {
-		$image_url = wp_get_attachment_url( $featured_image_id );
+    // If there is a featured image it has the priority
+    $featured_image_id = get_post_thumbnail_id( $post_id );
+    if ( is_numeric( $featured_image_id ) ) {
+        $image_url = wp_get_attachment_url( $featured_image_id );
 
-		return array( $image_url );
-	}
+        return array( $image_url );
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
-		'post_parent'    => $post_id,
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image',
-	) );
+    $images = get_children( array(
+        'post_parent'    => $post_id,
+        'post_type'      => 'attachment',
+        'post_mime_type' => 'image',
+    ) );
 
-	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
-		return array();
-	}
+    // Return an empty array if no image is found.
+    if ( empty( $images ) ) {
+        return array();
+    }
 
-	// Prepare the return array.
-	$image_urls = array();
+    // Prepare the return array.
+    $image_urls = array();
 
-	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
-		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
-		}
-	}
+    // Collect the URLs.
+    foreach ( $images as $attachment_id => $attachment ) {
+        $image_url = wp_get_attachment_url( $attachment_id );
+        // Ensure the URL isn't collected already.
+        if ( ! in_array( $image_url, $image_urls ) ) {
+            array_push( $image_urls, $image_url );
+        }
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
 
-	return $image_urls;
+    return $image_urls;
 }
 
 /**
@@ -358,19 +358,19 @@ 
  */
 function wl_get_sparql_images( $uri, $post_id ) {
 
-	$sparql = '';
+    $sparql = '';
 
-	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+    // Get the escaped URI.
+    $uri_e = esc_html( $uri );
 
-	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
-		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
-	}
+    // Add SPARQL stmts to write the schema:image.
+    $image_urls = wl_get_image_urls( $post_id );
+    foreach ( $image_urls as $image_url ) {
+        $image_url_esc = wl_sparql_escape_uri( $image_url );
+        $sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
+    }
 
-	return $sparql;
+    return $sparql;
 }
 
 /**
@@ -383,24 +383,24 @@ 
  */
 function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
 
-	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
+    // wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
-		'post_type'      => 'attachment',
-		'posts_per_page' => 1,
-		'post_status'    => 'any',
-		'post_parent'    => $parent_post_id,
-		'meta_key'       => 'wl_source_url',
-		'meta_value'     => $source_url,
-	) );
+    $posts = get_posts( array(
+        'post_type'      => 'attachment',
+        'posts_per_page' => 1,
+        'post_status'    => 'any',
+        'post_parent'    => $parent_post_id,
+        'meta_key'       => 'wl_source_url',
+        'meta_value'     => $source_url,
+    ) );
 
-	// Return the found post.
-	if ( 1 === count( $posts ) ) {
-		return $posts[0];
-	}
+    // Return the found post.
+    if ( 1 === count( $posts ) ) {
+        return $posts[0];
+    }
 
-	// Return null.
-	return NULL;
+    // Return null.
+    return NULL;
 }
 
 /**
@@ -411,8 +411,8 @@ 
  */
 function wl_set_source_url( $post_id, $source_url ) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+    delete_post_meta( $post_id, 'wl_source_url' );
+    add_post_meta( $post_id, 'wl_source_url', $source_url );
 }
 
 
@@ -430,61 +430,61 @@ 
  */
 function wl_flush_rewrite_rules_hard( $hard ) {
 
-	// If WL is not yet configured, we cannot perform any update, so we exit.
-	if ( '' === wl_configuration_get_key() ) {
-		return;
-	}
+    // If WL is not yet configured, we cannot perform any update, so we exit.
+    if ( '' === wl_configuration_get_key() ) {
+        return;
+    }
 
-	// Set the initial offset and limit each call to 100 posts to avoid memory errors.
-	$offset = 0;
-	$limit  = 100;
+    // Set the initial offset and limit each call to 100 posts to avoid memory errors.
+    $offset = 0;
+    $limit  = 100;
 
-	// Get more posts if the number of returned posts matches the limit.
-	while ( $limit === ( $posts = get_posts( array(
-			'offset'      => $offset,
-			'numberposts' => $limit,
-			'orderby'     => 'ID',
-			'post_type'   => 'any',
-			'post_status' => 'publish',
-		) ) ) ) {
+    // Get more posts if the number of returned posts matches the limit.
+    while ( $limit === ( $posts = get_posts( array(
+            'offset'      => $offset,
+            'numberposts' => $limit,
+            'orderby'     => 'ID',
+            'post_type'   => 'any',
+            'post_status' => 'publish',
+        ) ) ) ) {
 
-		// Holds the delete part of the query.
-		$delete_query = rl_sparql_prefixes();
+        // Holds the delete part of the query.
+        $delete_query = rl_sparql_prefixes();
 
-		// Holds the insert part of the query.
-		$insert_query = '';
+        // Holds the insert part of the query.
+        $insert_query = '';
 
-		// Cycle in each post to build the query.
-		foreach ( $posts as $post ) {
+        // Cycle in each post to build the query.
+        foreach ( $posts as $post ) {
 
-			// Ignore revisions.
-			if ( wp_is_post_revision( $post->ID ) ) {
-				continue;
-			}
+            // Ignore revisions.
+            if ( wp_is_post_revision( $post->ID ) ) {
+                continue;
+            }
 
-			// Get the entity URI.
-			$s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
-			                                                                 ->get_uri( $post->ID ) );
+            // Get the entity URI.
+            $s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
+                                                                                ->get_uri( $post->ID ) );
 
-			// Get the post URL.
-			// $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+            // Get the post URL.
+            // $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
 
-			// Prepare the DELETE and INSERT commands.
-			$delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
+            // Prepare the DELETE and INSERT commands.
+            $delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
 
-			$insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
-			                                                     ->get_insert_query( $s, $post->ID );
+            $insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
+                                                                    ->get_insert_query( $s, $post->ID );
 
-		}
+        }
 
 
-		// Execute the query.
-		rl_execute_sparql_update_query( $delete_query . $insert_query );
+        // Execute the query.
+        rl_execute_sparql_update_query( $delete_query . $insert_query );
 
-		// Advance to the next posts.
-		$offset += $limit;
+        // Advance to the next posts.
+        $offset += $limit;
 
-	}
+    }
 
 //	// Get all published posts.
 //	$posts = get_posts( array(
@@ -510,7 +510,7 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+    return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
 }
 
 /**
@@ -522,11 +522,11 @@ 
  */
 function wl_force_to_array( $value ) {
 
-	if ( ! is_array( $value ) ) {
-		return array( $value );
-	}
+    if ( ! is_array( $value ) ) {
+        return array( $value );
+    }
 
-	return $value;
+    return $value;
 }
 
 /**
@@ -534,26 +534,26 @@ 
  */
 function wl_shutdown() {
 
-	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    // Get the filename to the temporary SPARQL file.
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
 
-	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+    // If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
+    if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
 
-		// The request ID.
-		$args = array( WL_REQUEST_ID );
+        // The request ID.
+        $args = array( WL_REQUEST_ID );
 
-		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+        // Schedule the execution of the SPARQL query with the request ID.
+        wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
 
-		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+        // Check that the request is scheduled.
+        $timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
 
-		// Spawn the cron.
-		spawn_cron();
+        // Spawn the cron.
+        spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
-	}
+        wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+    }
 }
 
 add_action( 'shutdown', 'wl_shutdown' );
@@ -567,46 +567,46 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	// wl_write_log( "wl_replace_item_id_with_uri" );
+    // wl_write_log( "wl_replace_item_id_with_uri" );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+            // Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
+            $post = Wordlift_Entity_Service::get_instance()
+                                            ->get_entity_post_by_uri( $item_id );
 
-			// If no entity is found, continue to the next one.
-			if ( NULL === $post ) {
-				continue;
-			}
+            // If no entity is found, continue to the next one.
+            if ( NULL === $post ) {
+                continue;
+            }
 
-			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+            // Get the URI for that post.
+            $uri = wl_get_entity_uri( $post->ID );
 
-			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
+            // wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
-			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
-			}
-		}
-	}
+            // If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
+            if ( $item_id !== $uri ) {
+                $uri_e   = esc_html( $uri );
+                $content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+            }
+        }
+    }
 
-	// Reapply slashes.
-	$content = addslashes( $content );
+    // Reapply slashes.
+    $content = addslashes( $content );
 
-	return $content;
+    return $content;
 }
 
 add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
@@ -679,8 +679,8 @@ 
  * This action is documented in includes/class-wordlift-activator.php
  */
 function activate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
-	Wordlift_Activator::activate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-activator.php';
+    Wordlift_Activator::activate();
 }
 
 /**
@@ -688,8 +688,8 @@ 
  * This action is documented in includes/class-wordlift-deactivator.php
  */
 function deactivate_wordlift() {
-	require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
-	Wordlift_Deactivator::deactivate();
+    require_once plugin_dir_path( __FILE__ ) . 'includes/class-wordlift-deactivator.php';
+    Wordlift_Deactivator::deactivate();
 }
 
 register_activation_hook( __FILE__, 'activate_wordlift' );
@@ -712,8 +712,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +162 added lines, -162 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,11 +168,11 @@ 
  *
  * @return array The modified plugins array.
  */
-function wordlift_register_tinymce_javascript( $plugin_array ) {
+function wordlift_register_tinymce_javascript($plugin_array) {
 
 	// add the wordlift plugin.
 	// We can't use the minified version here.
-	$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;
 }
@@ -184,7 +184,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -192,17 +192,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');
 
 
 /**
@@ -211,30 +211,30 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js' );
-	wp_enqueue_script( 'angularjs-geolocation', plugin_dir_url( __FILE__ ) . '/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js' );
-	wp_enqueue_script( 'angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js' );
-	wp_enqueue_script( 'angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular.min.js');
+	wp_enqueue_script('angularjs-geolocation', plugin_dir_url(__FILE__).'/bower_components/angularjs-geolocation/dist/angularjs-geolocation.min.js');
+	wp_enqueue_script('angularjs-touch', 'https://cdnjs.cloudflare.com/ajax/libs/angular.js/1.3.11/angular-touch.min.js');
+	wp_enqueue_script('angularjs-animate', 'https://code.angularjs.org/1.3.11/angular-animate.min.js');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 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.
@@ -244,23 +244,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.
@@ -269,16 +269,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] : '',
 	);
 }
 
@@ -289,12 +289,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;
@@ -307,27 +307,27 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 
 	// If there is a featured image it has the priority
-	$featured_image_id = get_post_thumbnail_id( $post_id );
-	if ( is_numeric( $featured_image_id ) ) {
-		$image_url = wp_get_attachment_url( $featured_image_id );
+	$featured_image_id = get_post_thumbnail_id($post_id);
+	if (is_numeric($featured_image_id)) {
+		$image_url = wp_get_attachment_url($featured_image_id);
 
-		return array( $image_url );
+		return array($image_url);
 	}
 
 	// 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();
 	}
 
@@ -335,11 +335,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);
 		}
 	}
 
@@ -356,17 +356,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";
 	}
 
@@ -381,21 +381,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];
 	}
 
@@ -409,10 +409,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);
 }
 
 
@@ -428,10 +428,10 @@ 
  *
  * @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) {
 
 	// If WL is not yet configured, we cannot perform any update, so we exit.
-	if ( '' === wl_configuration_get_key() ) {
+	if ('' === wl_configuration_get_key()) {
 		return;
 	}
 
@@ -440,13 +440,13 @@ 
 	$limit  = 100;
 
 	// Get more posts if the number of returned posts matches the limit.
-	while ( $limit === ( $posts = get_posts( array(
+	while ($limit === ($posts = get_posts(array(
 			'offset'      => $offset,
 			'numberposts' => $limit,
 			'orderby'     => 'ID',
 			'post_type'   => 'any',
 			'post_status' => 'publish',
-		) ) ) ) {
+		)))) {
 
 		// Holds the delete part of the query.
 		$delete_query = rl_sparql_prefixes();
@@ -455,16 +455,16 @@ 
 		$insert_query = '';
 
 		// 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.
-			$s = Wordlift_Sparql_Service::escape_uri( Wordlift_Entity_Service::get_instance()
-			                                                                 ->get_uri( $post->ID ) );
+			$s = Wordlift_Sparql_Service::escape_uri(Wordlift_Entity_Service::get_instance()
+			                                                                 ->get_uri($post->ID));
 
 			// Get the post URL.
 			// $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
@@ -473,13 +473,13 @@ 
 			$delete_query .= "DELETE { <$s> schema:url ?u . } WHERE  { <$s> schema:url ?u . };\n";
 
 			$insert_query .= Wordlift_Schema_Url_Property_Service::get_instance()
-			                                                     ->get_insert_query( $s, $post->ID );
+			                                                     ->get_insert_query($s, $post->ID);
 
 		}
 
 
 		// Execute the query.
-		rl_execute_sparql_update_query( $delete_query . $insert_query );
+		rl_execute_sparql_update_query($delete_query.$insert_query);
 
 		// Advance to the next posts.
 		$offset += $limit;
@@ -495,7 +495,7 @@ 
 
 }
 
-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.
@@ -508,9 +508,9 @@ 
  *
  * @return string The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -520,10 +520,10 @@ 
  *
  * @return array Array containing $value (if $value was not an array)
  */
-function wl_force_to_array( $value ) {
+function wl_force_to_array($value) {
 
-	if ( ! is_array( $value ) ) {
-		return array( $value );
+	if ( ! is_array($value)) {
+		return array($value);
 	}
 
 	return $value;
@@ -535,28 +535,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.
@@ -565,113 +565,113 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->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');
 
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
-require_once( 'modules/caching/wordlift_caching.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
-require_once( 'modules/freebase_image_proxy/wordlift_freebase_image_proxy.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/caching/wordlift_caching.php');
+require_once('modules/redirector/wordlift_redirector.php');
+require_once('modules/freebase_image_proxy/wordlift_freebase_image_proxy.php');
 
 // Shortcodes
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');
 
 // Provide syncing features.
-require_once( 'admin/wordlift_admin_sync.php' );
+require_once('admin/wordlift_admin_sync.php');
 //}
 
 // load languages.
 // TODO: the following call gives for granted that the plugin is in the wordlift directory,
 //       we're currently doing this because wordlift is symbolic linked.
-load_plugin_textdomain( 'wordlift', FALSE, '/wordlift/languages' );
+load_plugin_textdomain('wordlift', FALSE, '/wordlift/languages');
 
 
 /**
@@ -679,7 +679,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();
 }
 
@@ -688,18 +688,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/admin/WL_Metabox/WL_Metabox_Field_coordinates.php

Spacing +18 added lines, -18 removed lines

@@ -3,7 +3,7 @@ 
 
 class WL_Metabox_Field_coordinates extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
+	public function __construct($args) {
 
 		// Just set up the necessary info without calling the parent constructor.
 		// TODO: write a parent class for grouped properties
@@ -15,7 +15,7 @@ 
 
 	public function get_data() {
 		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
+		$this->data = wl_get_coordinates($entity_id);
 	}
 
 	public function html() {
@@ -33,20 +33,20 @@ 
 		$data        = $this->data;
 		// TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
 		// want to use the current user location for the marker.
-		$coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
+		$coordinates = ( ! empty($data['latitude']) && ! empty($data['longitude']) ? sprintf('[%f,%f]', $data['latitude'], $data['longitude']) : '[0,0]');
 		$map_init    = '[0,0]' === $coordinates
 			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+			: sprintf("setView( [%f,%f], 9 )", $data['latitude'], $data['longitude']);
 
 		// Print input fields
-		$html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lat">'.__('Latitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="'.$data['latitude'].'" style="width:100%" />';
 
-		$html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
+		$html .= '<label for="wl_place_lon">'.__('Longitude', 'wordlift').'</label>';
+		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="'.$data['longitude'].'" style="width:100%" />';
 
 		// Show Leaflet map to pick coordinates
-		$element_id = uniqid( 'wl-gep-map-' );
+		$element_id = uniqid('wl-gep-map-');
 		$html .= <<<EOF
 
 <div id="$element_id"></div>
@@ -84,23 +84,23 @@ 
 		return $html;
 	}
 
-	public function save_data( $coords ) {
+	public function save_data($coords) {
 
-		$this->sanitize_data( $coords );
+		$this->sanitize_data($coords);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE);
+		delete_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE);
 
 		$latitude  = $this->data[0];
 		$longitude = $this->data[1];
 
 		// insert new coordinate values
-		if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
+		if ( ! empty($latitude) && ! empty($longitude)) {
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true);
+			add_post_meta($entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true);
 		}
 
 	}
@@ -108,11 +108,11 @@ 
 	/**
 	 * Only accept float numbers
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
 		// 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."
-		if ( ! is_numeric( $value ) ) {
+		if ( ! is_numeric($value)) {
 			return '';
 		}
 

Indentation +62 added lines, -62 removed lines

@@ -3,51 +3,51 @@ 
 
 class WL_Metabox_Field_coordinates extends WL_Metabox_Field {
 
-	public function __construct( $args ) {
+    public function __construct( $args ) {
 
-		// Just set up the necessary info without calling the parent constructor.
-		// TODO: write a parent class for grouped properties
+        // Just set up the necessary info without calling the parent constructor.
+        // TODO: write a parent class for grouped properties
 
-		// we use 'coordinates' to namespace the Field in $_POST data.
-		// In  the DB the correct meta names will be used.
-		$this->meta_name = 'coordinates';
-	}
+        // we use 'coordinates' to namespace the Field in $_POST data.
+        // In  the DB the correct meta names will be used.
+        $this->meta_name = 'coordinates';
+    }
 
-	public function get_data() {
-		$entity_id  = get_the_ID();
-		$this->data = wl_get_coordinates( $entity_id );
-	}
+    public function get_data() {
+        $entity_id  = get_the_ID();
+        $this->data = wl_get_coordinates( $entity_id );
+    }
 
-	public function html() {
+    public function html() {
 
-		// Open main <div> for the Field
-		$html = $this->html_wrapper_open();
+        // Open main <div> for the Field
+        $html = $this->html_wrapper_open();
 
-		// Label
-		$html .= '<h3>coordinates</h3>';
+        // Label
+        $html .= '<h3>coordinates</h3>';
 
-		// print nonce
-		$html .= $this->html_nonce();
+        // print nonce
+        $html .= $this->html_nonce();
 
-		// Get coordinates
-		$data        = $this->data;
-		// TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
-		// want to use the current user location for the marker.
-		$coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
-		$map_init    = '[0,0]' === $coordinates
-			? 'locate( {setView: true, maxZoom: 16} )'
-			: sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
+        // Get coordinates
+        $data        = $this->data;
+        // TODO: We temporary use here 0,0 as default coordinates for the marker, but if no coordinates are given we
+        // want to use the current user location for the marker.
+        $coordinates = ( ! empty( $data['latitude'] ) && ! empty( $data['longitude'] ) ? sprintf( '[%f,%f]', $data['latitude'], $data['longitude'] ) : '[0,0]' );
+        $map_init    = '[0,0]' === $coordinates
+            ? 'locate( {setView: true, maxZoom: 16} )'
+            : sprintf( "setView( [%f,%f], 9 )", $data['latitude'], $data['longitude'] );
 
-		// Print input fields
-		$html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
+        // Print input fields
+        $html .= '<label for="wl_place_lat">' . __( 'Latitude', 'wordlift' ) . '</label>';
+        $html .= '<input type="text" id="wl_place_lat" name="wl_metaboxes[coordinates][]" value="' . $data['latitude'] . '" style="width:100%" />';
 
-		$html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
-		$html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
+        $html .= '<label for="wl_place_lon">' . __( 'Longitude', 'wordlift' ) . '</label>';
+        $html .= '<input type="text" id="wl_place_lon" name="wl_metaboxes[coordinates][]" value="' . $data['longitude'] . '" style="width:100%" />';
 
-		// Show Leaflet map to pick coordinates
-		$element_id = uniqid( 'wl-gep-map-' );
-		$html .= <<<EOF
+        // Show Leaflet map to pick coordinates
+        $element_id = uniqid( 'wl-gep-map-' );
+        $html .= <<<EOF
 
 <div id="$element_id"></div>
 
@@ -79,44 +79,44 @@ 
 EOF;
 
 
-		$html .= $this->html_wrapper_close();
+        $html .= $this->html_wrapper_close();
 
-		return $html;
-	}
+        return $html;
+    }
 
-	public function save_data( $coords ) {
+    public function save_data( $coords ) {
 
-		$this->sanitize_data( $coords );
+        $this->sanitize_data( $coords );
 
-		$entity_id = get_the_ID();
+        $entity_id = get_the_ID();
 
-		// Take away old values
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
-		delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
+        // Take away old values
+        delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE );
+        delete_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE );
 
-		$latitude  = $this->data[0];
-		$longitude = $this->data[1];
+        $latitude  = $this->data[0];
+        $longitude = $this->data[1];
 
-		// insert new coordinate values
-		if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
-			add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
-		}
+        // insert new coordinate values
+        if ( ! empty( $latitude ) && ! empty( $longitude ) ) {
+            add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LATITUDE, $latitude, true );
+            add_post_meta( $entity_id, Wordlift_Schema_Service::FIELD_GEO_LONGITUDE, $longitude, true );
+        }
 
-	}
+    }
 
-	/**
-	 * Only accept float numbers
-	 */
-	public function sanitize_data_filter( $value ) {
+    /**
+     * Only accept float numbers
+     */
+    public function sanitize_data_filter( $value ) {
 
-		// 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."
-		if ( ! is_numeric( $value ) ) {
-			return '';
-		}
+        // 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."
+        if ( ! is_numeric( $value ) ) {
+            return '';
+        }
 
-		return $value;
-	}
+        return $value;
+    }
 }
 

src/admin/wordlift_admin_ajax_related_posts.php

Spacing +20 added lines, -20 removed lines

@@ -1,54 +1,54 @@
 <?php
 
-function wordlift_ajax_related_posts( $http_raw_data = null ) {
+function wordlift_ajax_related_posts($http_raw_data = null) {
     
     // Extract filtering conditions
-    if( !isset( $_GET["post_id"] ) || !is_numeric( $_GET["post_id"] ) ) {
+    if ( ! isset($_GET["post_id"]) || ! is_numeric($_GET["post_id"])) {
         wp_die('Post id missing or invalid!');
         return;
     }
 
     $post_id = $_GET["post_id"]; 
     // Get the current post
-    $post = get_post( $post_id );
+    $post = get_post($post_id);
 
-    wl_write_log( "Going to find posts related to current with post id: $post_id ..." );
+    wl_write_log("Going to find posts related to current with post id: $post_id ...");
     
     // Extract filtering conditions
-    $filtering_entity_uris = ( null == $http_raw_data ) ? file_get_contents("php://input") : $http_raw_data;
-    $filtering_entity_uris = json_decode( $filtering_entity_uris );
+    $filtering_entity_uris = (null == $http_raw_data) ? file_get_contents("php://input") : $http_raw_data;
+    $filtering_entity_uris = json_decode($filtering_entity_uris);
    
-    $filtering_entity_ids = wl_get_entity_post_ids_by_uris( $filtering_entity_uris );
+    $filtering_entity_ids = wl_get_entity_post_ids_by_uris($filtering_entity_uris);
     $related_posts = array();
     
     // If the current post is an antity 
     // related posts to the current entity are returned
-    if ( Wordlift_Entity_Service::TYPE_NAME == $post->post_type ) {
-        $filtering_entity_ids = array( $post_id );        
+    if (Wordlift_Entity_Service::TYPE_NAME == $post->post_type) {
+        $filtering_entity_ids = array($post_id);        
     }
 
-    if ( !empty( $filtering_entity_ids ) ) {
+    if ( ! empty($filtering_entity_ids)) {
     
-        $related_posts = wl_core_get_posts( array(
+        $related_posts = wl_core_get_posts(array(
             'get'             =>    'posts',  
             'related_to__in'  =>    $filtering_entity_ids,
-            'post__not_in'    =>    array( $post_id ),
+            'post__not_in'    =>    array($post_id),
             'post_type'       =>    'post',
             'post_status'     =>    'publish',
             'as'              =>    'subject',
-        ) );
+        ));
         
-        foreach ( $related_posts as $post_obj ) {
+        foreach ($related_posts as $post_obj) {
                 
-            $thumbnail = wp_get_attachment_url( get_post_thumbnail_id( $post_obj->ID, 'thumbnail' ) );
-            $post_obj->thumbnail = ( $thumbnail ) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH; 
-            $post_obj->link = get_edit_post_link( $post_obj->ID, 'none' );  
-            $post_obj->permalink = get_post_permalink( $post_obj->ID );  
+            $thumbnail = wp_get_attachment_url(get_post_thumbnail_id($post_obj->ID, 'thumbnail'));
+            $post_obj->thumbnail = ($thumbnail) ? $thumbnail : WL_DEFAULT_THUMBNAIL_PATH; 
+            $post_obj->link = get_edit_post_link($post_obj->ID, 'none');  
+            $post_obj->permalink = get_post_permalink($post_obj->ID);  
         
         }
     }
 
-    wl_core_send_json( $related_posts );
+    wl_core_send_json($related_posts);
 }
 
-add_action( 'wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts' );
+add_action('wp_ajax_wordlift_related_posts', 'wordlift_ajax_related_posts');

src/admin/wordlift_admin_save_post.php

Indentation +73 added lines, -73 removed lines

@@ -23,19 +23,19 @@ 
  */
 function wl_transition_post_status( $new_status, $old_status, $post ) {
 
-	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
-
-	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
-		rl_delete_post( $post );
-	}
-
-	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
-		}
-	}
+    // wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
+
+    // transition from *published* to any other status: delete the post.
+    if ( 'publish' === $old_status && 'publish' !== $new_status ) {
+        rl_delete_post( $post );
+    }
+
+    // when a post is published, then all the referenced entities must be published.
+    if ( 'publish' !== $old_status && 'publish' === $new_status ) {
+        foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
+            wl_update_post_status( $entity_id, 'publish' );
+        }
+    }
 }
 
 // hook save events.
@@ -49,49 +49,49 @@ 
  */
 function rl_delete_post( $post ) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+    $post_id = ( is_numeric( $post ) ? $post : $post->ID );
 
-	// hide all entities that are not referenced by any published post.
-	foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
+    // hide all entities that are not referenced by any published post.
+    foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
 
-		// check if there is at least one referencing post published.
-		$is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
+        // check if there is at least one referencing post published.
+        $is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
                     $post = get_post( $item );
                     return ( $carry || ( 'publish' === $post->post_status ) );
-		} );
-		// set the entity to draft if no referencing posts are published.
-		if ( ! $is_published ) {
-			wl_update_post_status( $entity_id, 'draft' );
-		}
-	}
-
-	// get the entity URI (valid also for posts)
-	$uri_esc = wl_sparql_escape_uri( wl_get_entity_uri( $post_id ) );
-
-	wl_write_log( "rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]" );
-
-	// create the SPARQL statement by joining the SPARQL prefixes and deleting any known predicate.
-	$stmt = rl_sparql_prefixes();
-	foreach ( wl_predicates() as $predicate ) {
-		$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n" .
-		         "DELETE { ?s $predicate <$uri_esc> . } WHERE { ?s $predicate <$uri_esc> . };\n";
-	}
-
-	// if the post is an entity and has exported properties, delete the related predicates.
-	if ( Wordlift_Entity_Service::TYPE_NAME === $post->post_type ) {
-		$type = wl_entity_type_taxonomy_get_type( $post->ID );
-
-		if ( isset( $type['custom_fields'] ) ) {
-			foreach ( $type['custom_fields'] as $field => $params ) {
-				// TODO: enclose in <> only if predicate starts with http(s)://
-				$predicate = '<' . $params['predicate'] . '>';
-				$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n";
-			}
-		}
-	}
-
-	// finally execute the query.
-	rl_execute_sparql_update_query( $stmt );
+        } );
+        // set the entity to draft if no referencing posts are published.
+        if ( ! $is_published ) {
+            wl_update_post_status( $entity_id, 'draft' );
+        }
+    }
+
+    // get the entity URI (valid also for posts)
+    $uri_esc = wl_sparql_escape_uri( wl_get_entity_uri( $post_id ) );
+
+    wl_write_log( "rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]" );
+
+    // create the SPARQL statement by joining the SPARQL prefixes and deleting any known predicate.
+    $stmt = rl_sparql_prefixes();
+    foreach ( wl_predicates() as $predicate ) {
+        $stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n" .
+                    "DELETE { ?s $predicate <$uri_esc> . } WHERE { ?s $predicate <$uri_esc> . };\n";
+    }
+
+    // if the post is an entity and has exported properties, delete the related predicates.
+    if ( Wordlift_Entity_Service::TYPE_NAME === $post->post_type ) {
+        $type = wl_entity_type_taxonomy_get_type( $post->ID );
+
+        if ( isset( $type['custom_fields'] ) ) {
+            foreach ( $type['custom_fields'] as $field => $params ) {
+                // TODO: enclose in <> only if predicate starts with http(s)://
+                $predicate = '<' . $params['predicate'] . '>';
+                $stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n";
+            }
+        }
+    }
+
+    // finally execute the query.
+    rl_execute_sparql_update_query( $stmt );
 }
 
 /**
@@ -102,34 +102,34 @@ 
  */
 function wl_update_post_status( $post_id, $status ) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+    wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
 
-	global $wpdb;
+    global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
-		return;
-	}
+    if ( ! $post = get_post( $post_id ) ) {
+        return;
+    }
 
-	if ( $status === $post->post_status ) {
-		return;
-	}
+    if ( $status === $post->post_status ) {
+        return;
+    }
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+    $wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
 
-	clean_post_cache( $post->ID );
+    clean_post_cache( $post->ID );
 
-	$old_status        = $post->post_status;
-	$post->post_status = $status;
+    $old_status        = $post->post_status;
+    $post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+    wp_transition_post_status( $status, $old_status, $post );
 
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
-	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
-	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'edit_post', $post->ID, $post );
+    /** This action is documented in wp-includes/post.php */
+    do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wl_linked_data_save_post', $post->ID );
+    /** This action is documented in wp-includes/post.php */
+    do_action( 'wp_insert_post', $post->ID, $post, true );
 }
 

Spacing +36 added lines, -36 removed lines

@@ -21,25 +21,25 @@ 
  * @param string $old_status The old post status
  * @param array $post An array with the post data
  */
-function wl_transition_post_status( $new_status, $old_status, $post ) {
+function wl_transition_post_status($new_status, $old_status, $post) {
 
 	// wl_write_log( "wl_transition_post_status [ new status :: $new_status ][ old status :: $old_status ][ post ID :: $post->ID ]" );
 
 	// transition from *published* to any other status: delete the post.
-	if ( 'publish' === $old_status && 'publish' !== $new_status ) {
-		rl_delete_post( $post );
+	if ('publish' === $old_status && 'publish' !== $new_status) {
+		rl_delete_post($post);
 	}
 
 	// when a post is published, then all the referenced entities must be published.
-	if ( 'publish' !== $old_status && 'publish' === $new_status ) {
-		foreach ( wl_core_get_related_entity_ids( $post->ID ) as $entity_id ) {
-			wl_update_post_status( $entity_id, 'publish' );
+	if ('publish' !== $old_status && 'publish' === $new_status) {
+		foreach (wl_core_get_related_entity_ids($post->ID) as $entity_id) {
+			wl_update_post_status($entity_id, 'publish');
 		}
 	}
 }
 
 // hook save events.
-add_action( 'transition_post_status', 'wl_transition_post_status', 10, 3 );
+add_action('transition_post_status', 'wl_transition_post_status', 10, 3);
 
 
 /**
@@ -47,51 +47,51 @@ 
  *
  * @param array|int $post An array of post data
  */
-function rl_delete_post( $post ) {
+function rl_delete_post($post) {
 
-	$post_id = ( is_numeric( $post ) ? $post : $post->ID );
+	$post_id = (is_numeric($post) ? $post : $post->ID);
 
 	// hide all entities that are not referenced by any published post.
-	foreach ( wl_core_get_related_entity_ids( $post_id ) as $entity_id ) {
+	foreach (wl_core_get_related_entity_ids($post_id) as $entity_id) {
 
 		// check if there is at least one referencing post published.
-		$is_published = array_reduce( wl_core_get_related_post_ids( $entity_id ), function ( $carry, $item ) {
-                    $post = get_post( $item );
-                    return ( $carry || ( 'publish' === $post->post_status ) );
+		$is_published = array_reduce(wl_core_get_related_post_ids($entity_id), function($carry, $item) {
+                    $post = get_post($item);
+                    return ($carry || ('publish' === $post->post_status));
 		} );
 		// set the entity to draft if no referencing posts are published.
-		if ( ! $is_published ) {
-			wl_update_post_status( $entity_id, 'draft' );
+		if ( ! $is_published) {
+			wl_update_post_status($entity_id, 'draft');
 		}
 	}
 
 	// get the entity URI (valid also for posts)
-	$uri_esc = wl_sparql_escape_uri( wl_get_entity_uri( $post_id ) );
+	$uri_esc = wl_sparql_escape_uri(wl_get_entity_uri($post_id));
 
-	wl_write_log( "rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]" );
+	wl_write_log("rl_delete_post [ post id :: $post_id ][ uri esc :: $uri_esc ]");
 
 	// create the SPARQL statement by joining the SPARQL prefixes and deleting any known predicate.
 	$stmt = rl_sparql_prefixes();
-	foreach ( wl_predicates() as $predicate ) {
-		$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n" .
+	foreach (wl_predicates() as $predicate) {
+		$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n".
 		         "DELETE { ?s $predicate <$uri_esc> . } WHERE { ?s $predicate <$uri_esc> . };\n";
 	}
 
 	// if the post is an entity and has exported properties, delete the related predicates.
-	if ( Wordlift_Entity_Service::TYPE_NAME === $post->post_type ) {
-		$type = wl_entity_type_taxonomy_get_type( $post->ID );
+	if (Wordlift_Entity_Service::TYPE_NAME === $post->post_type) {
+		$type = wl_entity_type_taxonomy_get_type($post->ID);
 
-		if ( isset( $type['custom_fields'] ) ) {
-			foreach ( $type['custom_fields'] as $field => $params ) {
+		if (isset($type['custom_fields'])) {
+			foreach ($type['custom_fields'] as $field => $params) {
 				// TODO: enclose in <> only if predicate starts with http(s)://
-				$predicate = '<' . $params['predicate'] . '>';
+				$predicate = '<'.$params['predicate'].'>';
 				$stmt .= "DELETE { <$uri_esc> $predicate ?o . } WHERE { <$uri_esc> $predicate ?o . };\n";
 			}
 		}
 	}
 
 	// finally execute the query.
-	rl_execute_sparql_update_query( $stmt );
+	rl_execute_sparql_update_query($stmt);
 }
 
 /**
@@ -100,36 +100,36 @@ 
  * @param int $post_id The post ID
  * @param string $status The new status
  */
-function wl_update_post_status( $post_id, $status ) {
+function wl_update_post_status($post_id, $status) {
 
-	wl_write_log( "wl_update_post_status [ post ID :: $post_id ][ status :: $status ]" );
+	wl_write_log("wl_update_post_status [ post ID :: $post_id ][ status :: $status ]");
 
 	global $wpdb;
 
-	if ( ! $post = get_post( $post_id ) ) {
+	if ( ! $post = get_post($post_id)) {
 		return;
 	}
 
-	if ( $status === $post->post_status ) {
+	if ($status === $post->post_status) {
 		return;
 	}
 
-	$wpdb->update( $wpdb->posts, array( 'post_status' => $status ), array( 'ID' => $post->ID ) );
+	$wpdb->update($wpdb->posts, array('post_status' => $status), array('ID' => $post->ID));
 
-	clean_post_cache( $post->ID );
+	clean_post_cache($post->ID);
 
 	$old_status        = $post->post_status;
 	$post->post_status = $status;
 
-	wp_transition_post_status( $status, $old_status, $post );
+	wp_transition_post_status($status, $old_status, $post);
 
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'edit_post', $post->ID, $post );
+	do_action('edit_post', $post->ID, $post);
 	/** This action is documented in wp-includes/post.php */
-	do_action( "save_post_{$post->post_type}", $post->ID, $post, true );
+	do_action("save_post_{$post->post_type}", $post->ID, $post, true);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wl_linked_data_save_post', $post->ID );
+	do_action('wl_linked_data_save_post', $post->ID);
 	/** This action is documented in wp-includes/post.php */
-	do_action( 'wp_insert_post', $post->ID, $post, true );
+	do_action('wp_insert_post', $post->ID, $post, true);
 }
 

src/admin/wordlift_admin_shortcodes.php

Indentation +20 added lines, -20 removed lines

@@ -9,12 +9,12 @@ 
  * Loads the buttons in TinyMCE.
  */
 function wl_admin_shortcode_buttons() {
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
-		add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
-		add_action( 'admin_footer', 'wl_admin_inject_chord_dialog_dependencies' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
+        add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
+        add_action( 'admin_footer', 'wl_admin_inject_chord_dialog_dependencies' );
+    }
 }
 
 /**
@@ -26,9 +26,9 @@ 
  */
 function wl_admin_shortcode_buttons_register_tinymce_javascript( $plugin_array ) {
 
-	$plugin_array['wl_shortcodes'] = plugin_dir_url( __FILE__ ) . 'js/wordlift_shortcode_tinymce_plugin.js';
+    $plugin_array['wl_shortcodes'] = plugin_dir_url( __FILE__ ) . 'js/wordlift_shortcode_tinymce_plugin.js';
 
-	return $plugin_array;
+    return $plugin_array;
 }
 
 /**
@@ -39,9 +39,9 @@ 
  * @return array The buttons array including the *wl_shortcodes_menu*.
  */
 function wl_admin_shortcode_register_buttons( $buttons ) {
-	array_push( $buttons, 'wl_shortcodes_menu' );
+    array_push( $buttons, 'wl_shortcodes_menu' );
 
-	return $buttons;
+    return $buttons;
 }
 
 // init process for button control
@@ -55,16 +55,16 @@ 
  */
 function wl_admin_inject_chord_dialog_dependencies() {
 
-	wp_enqueue_style( 'wp-color-picker' );
-	wp_enqueue_script( 'wp-color-picker' );
-	wp_enqueue_style( 'jquery-ui-slider' );
-	// Not included by default :|
-	// TODO include jquery ui css from the plugin creates css issues on the slider
-	// wp_enqueue_style('jquery-ui-css', plugins_url( 'css/jquery-ui/jquery-ui.min.css', __FILE__ ) );
-	wp_enqueue_style( 'wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css' );
+    wp_enqueue_style( 'wp-color-picker' );
+    wp_enqueue_script( 'wp-color-picker' );
+    wp_enqueue_style( 'jquery-ui-slider' );
+    // Not included by default :|
+    // TODO include jquery ui css from the plugin creates css issues on the slider
+    // wp_enqueue_style('jquery-ui-css', plugins_url( 'css/jquery-ui/jquery-ui.min.css', __FILE__ ) );
+    wp_enqueue_style( 'wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css' );
 
-	wp_enqueue_script( 'jquery' );
-	wp_enqueue_script( 'jquery-ui-core' );
-	wp_enqueue_script( 'jquery-ui-slider' );
+    wp_enqueue_script( 'jquery' );
+    wp_enqueue_script( 'jquery-ui-core' );
+    wp_enqueue_script( 'jquery-ui-slider' );
 
 }

Spacing +16 added lines, -16 removed lines

@@ -10,10 +10,10 @@ 
  */
 function wl_admin_shortcode_buttons() {
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript' );
-		add_filter( 'mce_buttons', 'wl_admin_shortcode_register_buttons' );
-		add_action( 'admin_footer', 'wl_admin_inject_chord_dialog_dependencies' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wl_admin_shortcode_buttons_register_tinymce_javascript');
+		add_filter('mce_buttons', 'wl_admin_shortcode_register_buttons');
+		add_action('admin_footer', 'wl_admin_inject_chord_dialog_dependencies');
 	}
 }
 
@@ -24,9 +24,9 @@ 
  *
  * @return array The TinyMCE plugins array including WordLift shortcodes plugin.
  */
-function wl_admin_shortcode_buttons_register_tinymce_javascript( $plugin_array ) {
+function wl_admin_shortcode_buttons_register_tinymce_javascript($plugin_array) {
 
-	$plugin_array['wl_shortcodes'] = plugin_dir_url( __FILE__ ) . 'js/wordlift_shortcode_tinymce_plugin.js';
+	$plugin_array['wl_shortcodes'] = plugin_dir_url(__FILE__).'js/wordlift_shortcode_tinymce_plugin.js';
 
 	return $plugin_array;
 }
@@ -38,14 +38,14 @@ 
  *
  * @return array The buttons array including the *wl_shortcodes_menu*.
  */
-function wl_admin_shortcode_register_buttons( $buttons ) {
-	array_push( $buttons, 'wl_shortcodes_menu' );
+function wl_admin_shortcode_register_buttons($buttons) {
+	array_push($buttons, 'wl_shortcodes_menu');
 
 	return $buttons;
 }
 
 // init process for button control
-add_action( 'admin_init', 'wl_admin_shortcode_buttons' );
+add_action('admin_init', 'wl_admin_shortcode_buttons');
 
 
 /**
@@ -55,16 +55,16 @@ 
  */
 function wl_admin_inject_chord_dialog_dependencies() {
 
-	wp_enqueue_style( 'wp-color-picker' );
-	wp_enqueue_script( 'wp-color-picker' );
-	wp_enqueue_style( 'jquery-ui-slider' );
+	wp_enqueue_style('wp-color-picker');
+	wp_enqueue_script('wp-color-picker');
+	wp_enqueue_style('jquery-ui-slider');
 	// Not included by default :|
 	// TODO include jquery ui css from the plugin creates css issues on the slider
 	// wp_enqueue_style('jquery-ui-css', plugins_url( 'css/jquery-ui/jquery-ui.min.css', __FILE__ ) );
-	wp_enqueue_style( 'wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css' );
+	wp_enqueue_style('wp-jquery-ui-css', 'https://ajax.googleapis.com/ajax/libs/jqueryui/1.8/themes/base/jquery.ui.all.css');
 
-	wp_enqueue_script( 'jquery' );
-	wp_enqueue_script( 'jquery-ui-core' );
-	wp_enqueue_script( 'jquery-ui-slider' );
+	wp_enqueue_script('jquery');
+	wp_enqueue_script('jquery-ui-core');
+	wp_enqueue_script('jquery-ui-slider');
 
 }