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 +31 added lines, -31 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' 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' 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' 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' 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 );
@@ -43,24 +43,24 @@ 
  */
 function wl_admin_search_duplicated_entity_while_editing_title( $hook ) {
 
-	// Only enqueueing script when editing an entity
-	if ( $hook == 'post.php' ) {
+    // Only enqueueing script when editing an entity
+    if ( $hook == 'post.php' ) {
 
-		// Get entity object (the auto-draft created automagically by WP)
-		$entity_being_edited = get_post();
+        // Get entity object (the auto-draft created automagically by WP)
+        $entity_being_edited = get_post();
 
-		// Exit if we are not dealing with an entity
-		if ( $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME ) {
+        // Exit if we are not dealing with an entity
+        if ( $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME ) {
 
-			wp_enqueue_script( 'wl-entity-duplicated-titles-live-search', plugin_dir_url( __FILE__ ) . 'js/wl_entity-duplicated-titles-live-search.js' );
-			wp_localize_script( 'wl-entity-duplicated-titles-live-search', 'wlEntityDuplicatedTitlesLiveSearchParams', array(
-					'ajax_url' => admin_url( 'admin-ajax.php' ),
-					'action'   => 'entity_by_title',
-					'post_id'  => get_the_ID()
-				)
-			);
-		}
-	}
+            wp_enqueue_script( 'wl-entity-duplicated-titles-live-search', plugin_dir_url( __FILE__ ) . 'js/wl_entity-duplicated-titles-live-search.js' );
+            wp_localize_script( 'wl-entity-duplicated-titles-live-search', 'wlEntityDuplicatedTitlesLiveSearchParams', array(
+                    'ajax_url' => admin_url( 'admin-ajax.php' ),
+                    'action'   => 'entity_by_title',
+                    'post_id'  => get_the_ID()
+                )
+            );
+        }
+    }
 }
 
 add_action( 'admin_enqueue_scripts', 'wl_admin_search_duplicated_entity_while_editing_title' );
\ No newline at end of file

Spacing +19 added lines, -19 removed lines

@@ -14,47 +14,47 @@ 
  *
  * @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' 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' 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' 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' target='_blank'>".
+		         __('Test Google Rich Snippets', 'wordlift').
 		         "</a></span>\n";
 	}
 
 	return $html;
 }
 
-add_filter( 'get_sample_permalink_html', 'wl_admin_permalink_html', 10, 4 );
+add_filter('get_sample_permalink_html', 'wl_admin_permalink_html', 10, 4);
 
 
 /*
  * Let user know if he is creating a duplicated entity (performing a live AJAX check on the entity title)
  */
-function wl_admin_search_duplicated_entity_while_editing_title( $hook ) {
+function wl_admin_search_duplicated_entity_while_editing_title($hook) {
 
 	// Only enqueueing script when editing an entity
-	if ( $hook == 'post.php' ) {
+	if ($hook == 'post.php') {
 
 		// Get entity object (the auto-draft created automagically by WP)
 		$entity_being_edited = get_post();
 
 		// Exit if we are not dealing with an entity
-		if ( $entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME ) {
+		if ($entity_being_edited->post_type == Wordlift_Entity_Service::TYPE_NAME) {
 
-			wp_enqueue_script( 'wl-entity-duplicated-titles-live-search', plugin_dir_url( __FILE__ ) . 'js/wl_entity-duplicated-titles-live-search.js' );
-			wp_localize_script( 'wl-entity-duplicated-titles-live-search', 'wlEntityDuplicatedTitlesLiveSearchParams', array(
-					'ajax_url' => admin_url( 'admin-ajax.php' ),
+			wp_enqueue_script('wl-entity-duplicated-titles-live-search', plugin_dir_url(__FILE__).'js/wl_entity-duplicated-titles-live-search.js');
+			wp_localize_script('wl-entity-duplicated-titles-live-search', 'wlEntityDuplicatedTitlesLiveSearchParams', array(
+					'ajax_url' => admin_url('admin-ajax.php'),
 					'action'   => 'entity_by_title',
 					'post_id'  => get_the_ID()
 				)
@@ -63,4 +63,4 @@ 
 	}
 }
 
-add_action( 'admin_enqueue_scripts', 'wl_admin_search_duplicated_entity_while_editing_title' );
\ No newline at end of file
+add_action('admin_enqueue_scripts', 'wl_admin_search_duplicated_entity_while_editing_title');
\ 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.
 */

Indentation +22 added lines, -22 removed lines

@@ -14,19 +14,19 @@ 
     ) );
 }
 /**
- * Return an array of validation rules used by wl_core_get_posts
- * 
- * @return array in the format field => (array) accepeted_values 
- */
+     * Return an array of validation rules used by wl_core_get_posts
+     * 
+     * @return array in the format field => (array) accepeted_values 
+     */
 function wl_core_get_validation_rules() { 
 
     return unserialize( WL_CORE_GET_POSTS_VALIDATION_RULES );
 }
 /**
- * Return the wordlift relation instances table name
- * 
- * @return string Return the wordlift relation instances table name
- */
+     * Return the wordlift relation instances table name
+     * 
+     * @return string Return the wordlift relation instances table name
+     */
 function wl_core_get_relation_instances_table_name() { 
 
     global $wpdb;
@@ -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;

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

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 +114 added lines, -114 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,21 +176,21 @@ 
  */
 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];
+    }
 
-	// Build full schema uri if necessary
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+    // Build full schema uri if necessary
+    $type_names = wl_build_full_schema_uri_from_schema_slug( $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 );
 }
 
 /**
@@ -205,24 +205,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;
 }
 
 /**
@@ -234,11 +234,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 +53 added lines, -53 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,23 +174,23 @@ 
  *
  * @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];
 	}
 
 	// Build full schema uri if necessary
-	$type_names = wl_build_full_schema_uri_from_schema_slug( $type_names );
+	$type_names = wl_build_full_schema_uri_from_schema_slug($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);
 }
 
 /**
@@ -203,10 +203,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();
@@ -215,10 +215,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']);
 		}
 	}
 
@@ -232,12 +232,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/modules/entity_view/class-wl-view.php

Doc Comments +3 added lines

@@ -132,6 +132,9 @@
 
 	}
 
+	/**
+	 * @param string $expr
+	 */
 	function expand( $expr ) {
 
 		foreach ( wl_prefixes_list() as $item ) {

Indentation +191 added lines, -191 removed lines

@@ -2,17 +2,17 @@ 
 
 // Load JsonPath.
 if ( ! class_exists( 'JSONPath' ) ) {
-	require_once( 'JSONPath/JSONPath.php' );
-	require_once( 'JSONPath/JSONPathLexer.php' );
-	require_once( 'JSONPath/JSONPathException.php' );
-	require_once( 'JSONPath/Filters/AbstractFilter.php' );
-	require_once( 'JSONPath/Filters/IndexesFilter.php' );
-	require_once( 'JSONPath/Filters/IndexFilter.php' );
-	require_once( 'JSONPath/Filters/QueryMatchFilter.php' );
-	require_once( 'JSONPath/Filters/QueryResultFilter.php' );
-	require_once( 'JSONPath/Filters/RecursiveFilter.php' );
-	require_once( 'JSONPath/Filters/SliceFilter.php' );
-	require_once( 'JSONPath/Filters/LoadFilter.php' );
+    require_once( 'JSONPath/JSONPath.php' );
+    require_once( 'JSONPath/JSONPathLexer.php' );
+    require_once( 'JSONPath/JSONPathException.php' );
+    require_once( 'JSONPath/Filters/AbstractFilter.php' );
+    require_once( 'JSONPath/Filters/IndexesFilter.php' );
+    require_once( 'JSONPath/Filters/IndexFilter.php' );
+    require_once( 'JSONPath/Filters/QueryMatchFilter.php' );
+    require_once( 'JSONPath/Filters/QueryResultFilter.php' );
+    require_once( 'JSONPath/Filters/RecursiveFilter.php' );
+    require_once( 'JSONPath/Filters/SliceFilter.php' );
+    require_once( 'JSONPath/Filters/LoadFilter.php' );
 }
 
 
@@ -25,219 +25,219 @@ 
  */
 class WL_View {
 
-	var $base_uri, $suffix, $title, $language, $graph, $url;
-
-	var $json_path;
-
-	/**
-	 * Create an instance of WL_View.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @uses wl_configuration_get_redlink_dataset_uri() to get the default dataset URI.
-	 *
-	 * @param string $base_uri The base URI for resources, default the WordLift dataset.
-	 * @param string $suffix The suffix to append to URI in order to load the JSON-LD file, default *.json*.
-	 * @param string $title The predicate used to set the title of the page, default *rdfs:label*.
-	 * @param string $language The language for values, default *en*.
-	 */
-	function __construct( $base_uri = null, $suffix = '.json', $title = 'rdfs:label', $language = 'en' ) {
-
-		// Set the instance variables.
-		$this->base_uri = ( null === $base_uri ? wl_configuration_get_redlink_dataset_uri() : $base_uri );
-		$this->suffix   = $suffix;
-		$this->title    = $title;
-		$this->language = $language;
-
-		wl_write_log( "[ base URI :: $this->base_uri ][ suffix :: $this->suffix ][ title :: $this->title ][ language :: $this->language ]" );
-
-		add_filter( 'wp_title', array( $this, 'filter_page_title' ), 10, 2 );
-	}
-
-
-
-	/**
-	 * Set the page title using the provided title.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @see wp_title the WordPress filter that calls this method.
-	 * @see http://codex.wordpress.org/Plugin_API/Filter_Reference/wp_title
-	 *
-	 * @param string $title The existing title.
-	 * @param string $sep   The title separator.
-	 * @return string The new title.
-	 */
-	function filter_page_title( $title, $sep ) {
-
-		$expr       = "$['$this->title'][?(@.@language=='$this->language')].@value";
-		$view_title = $this->get_first_property_html( $expr );
-
-		return $view_title . " $sep $title";
-
-	}
-
-	/**
-	 * Load the JSON-LD at the specified path (the path is appended to the *base_uri*). If the path is empty or null
-	 * it is loaded from the query variables (via WordPress).
-	 *
-	 * @since 3.0.0
-	 *
-	 * @uses wl_configuration_get_redlink_dataset_uri() to get the default dataset URI.
-	 * @uses wl_jsonld_load_remote() to load a remote JSON-LD file.
-	 *
-	 * @param string $path The entity path.
-	 */
-	function load( $path = null ) {
-
-		// If the path is empty, load the resource from the query string variable.
-		if ( empty( $path ) ) {
-			$path = get_query_var( WL_ENTITY_VIEW_ENTITY_ID_QUERY_VAR );
-		}
-
-		// If a base URI has been set, append the path, otherwise use the path.
-		$this->url = ( ! empty( $this->base_uri )
-			? $this->base_uri . ( '/' !== substr( $this->base_uri, - 1, 1 ) ? '/' : '' ) . $path
-			: $path );
-
-		$this->graph     = wl_jsonld_load_remote( $this->url . $this->suffix );
-		$this->json_path = new JSONPath( $this->graph );
-
-	}
-
-	/**
-	 * Get the property with the specified name. The value at the specified index will be returned.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @uses expand() to expand the property name.
-	 *
-	 * @param string $name          The property name.
-	 * @param int $index            The value index (default NULL, returns an array of properties).
-	 *
-	 * @return string|array The property value.
-	 */
-	function get_property( $name, $index = NULL ) {
-
-
-		$values = $this->json_path->find( $this->expand( $name ) );
-
-		wl_write_log( "[ name :: $name ][ index :: $index ][ value :: " . var_export( $values, true ) . " ]" );
-
-
-		return ( NULL !== $index ? $values[ $index ] : $values );
+    var $base_uri, $suffix, $title, $language, $graph, $url;
+
+    var $json_path;
+
+    /**
+     * Create an instance of WL_View.
+     *
+     * @since 3.0.0
+     *
+     * @uses wl_configuration_get_redlink_dataset_uri() to get the default dataset URI.
+     *
+     * @param string $base_uri The base URI for resources, default the WordLift dataset.
+     * @param string $suffix The suffix to append to URI in order to load the JSON-LD file, default *.json*.
+     * @param string $title The predicate used to set the title of the page, default *rdfs:label*.
+     * @param string $language The language for values, default *en*.
+     */
+    function __construct( $base_uri = null, $suffix = '.json', $title = 'rdfs:label', $language = 'en' ) {
+
+        // Set the instance variables.
+        $this->base_uri = ( null === $base_uri ? wl_configuration_get_redlink_dataset_uri() : $base_uri );
+        $this->suffix   = $suffix;
+        $this->title    = $title;
+        $this->language = $language;
+
+        wl_write_log( "[ base URI :: $this->base_uri ][ suffix :: $this->suffix ][ title :: $this->title ][ language :: $this->language ]" );
+
+        add_filter( 'wp_title', array( $this, 'filter_page_title' ), 10, 2 );
+    }
+
+
+
+    /**
+     * Set the page title using the provided title.
+     *
+     * @since 3.0.0
+     *
+     * @see wp_title the WordPress filter that calls this method.
+     * @see http://codex.wordpress.org/Plugin_API/Filter_Reference/wp_title
+     *
+     * @param string $title The existing title.
+     * @param string $sep   The title separator.
+     * @return string The new title.
+     */
+    function filter_page_title( $title, $sep ) {
+
+        $expr       = "$['$this->title'][?(@.@language=='$this->language')].@value";
+        $view_title = $this->get_first_property_html( $expr );
+
+        return $view_title . " $sep $title";
+
+    }
+
+    /**
+     * Load the JSON-LD at the specified path (the path is appended to the *base_uri*). If the path is empty or null
+     * it is loaded from the query variables (via WordPress).
+     *
+     * @since 3.0.0
+     *
+     * @uses wl_configuration_get_redlink_dataset_uri() to get the default dataset URI.
+     * @uses wl_jsonld_load_remote() to load a remote JSON-LD file.
+     *
+     * @param string $path The entity path.
+     */
+    function load( $path = null ) {
+
+        // If the path is empty, load the resource from the query string variable.
+        if ( empty( $path ) ) {
+            $path = get_query_var( WL_ENTITY_VIEW_ENTITY_ID_QUERY_VAR );
+        }
+
+        // If a base URI has been set, append the path, otherwise use the path.
+        $this->url = ( ! empty( $this->base_uri )
+            ? $this->base_uri . ( '/' !== substr( $this->base_uri, - 1, 1 ) ? '/' : '' ) . $path
+            : $path );
+
+        $this->graph     = wl_jsonld_load_remote( $this->url . $this->suffix );
+        $this->json_path = new JSONPath( $this->graph );
+
+    }
+
+    /**
+     * Get the property with the specified name. The value at the specified index will be returned.
+     *
+     * @since 3.0.0
+     *
+     * @uses expand() to expand the property name.
+     *
+     * @param string $name          The property name.
+     * @param int $index            The value index (default NULL, returns an array of properties).
+     *
+     * @return string|array The property value.
+     */
+    function get_property( $name, $index = NULL ) {
+
+
+        $values = $this->json_path->find( $this->expand( $name ) );
+
+        wl_write_log( "[ name :: $name ][ index :: $index ][ value :: " . var_export( $values, true ) . " ]" );
+
+
+        return ( NULL !== $index ? $values[ $index ] : $values );
 
 //		$value = wl_jsonld_get_property( $this->graph, $name, $language, $this->suffix, $index );
 //		return $value;
 
-	}
+    }
 
-	function expand( $expr ) {
+    function expand( $expr ) {
 
-		foreach ( wl_prefixes_list() as $item ) {
-			$prefix    = $item['prefix'];
-			$namespace = $item['namespace'];
-			$expr      = preg_replace( "/(['\"])$prefix:/", "\${1}$namespace", $expr );
-			$expr      = preg_replace( "/\\.$prefix:([^.]+)\\./", "['$namespace\${1}']", $expr );
-		}
+        foreach ( wl_prefixes_list() as $item ) {
+            $prefix    = $item['prefix'];
+            $namespace = $item['namespace'];
+            $expr      = preg_replace( "/(['\"])$prefix:/", "\${1}$namespace", $expr );
+            $expr      = preg_replace( "/\\.$prefix:([^.]+)\\./", "['$namespace\${1}']", $expr );
+        }
 
 
-		return $expr;
-	}
+        return $expr;
+    }
 
-	function get_property_html( $name, $index = 0 ) {
+    function get_property_html( $name, $index = 0 ) {
 
-		return esc_html( $this->get_property( $name, $index ) );
+        return esc_html( $this->get_property( $name, $index ) );
 
-	}
+    }
 
-	/**
-	 * Gets the first property with the provided name.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @uses get_first_property() to get the first property value.
-	 *
-	 * @param string $name The predicate name.
-	 *
-	 * @return string The value.
-	 */
-	function get_first_property_html( $name ) {
+    /**
+     * Gets the first property with the provided name.
+     *
+     * @since 3.0.0
+     *
+     * @uses get_first_property() to get the first property value.
+     *
+     * @param string $name The predicate name.
+     *
+     * @return string The value.
+     */
+    function get_first_property_html( $name ) {
 
-		return esc_html( $this->get_first_property( $name ) );
+        return esc_html( $this->get_first_property( $name ) );
 
-	}
+    }
 
-	/**
-	 * Gets the first property with the provided name and returns it HTML escaped.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @uses get_property() to get the property value.
-	 *
-	 * @param string $name The predicate name.
-	 *
-	 * @return string The value.
-	 */
-	function get_first_property( $name ) {
+    /**
+     * Gets the first property with the provided name and returns it HTML escaped.
+     *
+     * @since 3.0.0
+     *
+     * @uses get_property() to get the property value.
+     *
+     * @param string $name The predicate name.
+     *
+     * @return string The value.
+     */
+    function get_first_property( $name ) {
 
-		return $this->get_property( $name, 0 );
+        return $this->get_property( $name, 0 );
 
-	}
+    }
 
 
-	function echo_property( $name, $index = 0 ) {
+    function echo_property( $name, $index = 0 ) {
 
-		echo $this->get_property( $name, $index );
+        echo $this->get_property( $name, $index );
 
-	}
+    }
 
-	/**
-	 * @since 3.0.0
-	 *
-	 * @param $name
-	 *
-	 * @return string
-	 */
-	function get_property_localized( $name ) {
+    /**
+     * @since 3.0.0
+     *
+     * @param $name
+     *
+     * @return string
+     */
+    function get_property_localized( $name ) {
 
-		return $this->get_property( $this->localize_expression( $name ) );
+        return $this->get_property( $this->localize_expression( $name ) );
 
-	}
+    }
 
-	function get_first_property_localized( $name ) {
+    function get_first_property_localized( $name ) {
 
-		return $this->get_first_property( $this->localize_expression( $name ) );
+        return $this->get_first_property( $this->localize_expression( $name ) );
 
-	}
+    }
 
-	/**
-	 * @since 3.0.0
-	 *
-	 * @param $name
-	 *
-	 * @return string
-	 */
-	function get_first_property_html_localized( $name ) {
+    /**
+     * @since 3.0.0
+     *
+     * @param $name
+     *
+     * @return string
+     */
+    function get_first_property_html_localized( $name ) {
 
-		return esc_html( $this->get_first_property_localized( $name ) );
+        return esc_html( $this->get_first_property_localized( $name ) );
 
-	}
+    }
 
-	/**
-	 * Localizes the expression using the language set when creating the view instance.
-	 *
-	 * @since 3.0.0
-	 *
-	 * @param string $name The expression to localize.
-	 *
-	 * @return string The localized expression.
-	 */
-	function localize_expression( $name ) {
+    /**
+     * Localizes the expression using the language set when creating the view instance.
+     *
+     * @since 3.0.0
+     *
+     * @param string $name The expression to localize.
+     *
+     * @return string The localized expression.
+     */
+    function localize_expression( $name ) {
 
-		return $name . "[?(@.@language=='$this->language')].@value";
+        return $name . "[?(@.@language=='$this->language')].@value";
 
-	}
+    }
 
 
 } 
\ No newline at end of file

Spacing +51 added lines, -51 removed lines

@@ -1,18 +1,18 @@ 
 <?php
 
 // Load JsonPath.
-if ( ! class_exists( 'JSONPath' ) ) {
-	require_once( 'JSONPath/JSONPath.php' );
-	require_once( 'JSONPath/JSONPathLexer.php' );
-	require_once( 'JSONPath/JSONPathException.php' );
-	require_once( 'JSONPath/Filters/AbstractFilter.php' );
-	require_once( 'JSONPath/Filters/IndexesFilter.php' );
-	require_once( 'JSONPath/Filters/IndexFilter.php' );
-	require_once( 'JSONPath/Filters/QueryMatchFilter.php' );
-	require_once( 'JSONPath/Filters/QueryResultFilter.php' );
-	require_once( 'JSONPath/Filters/RecursiveFilter.php' );
-	require_once( 'JSONPath/Filters/SliceFilter.php' );
-	require_once( 'JSONPath/Filters/LoadFilter.php' );
+if ( ! class_exists('JSONPath')) {
+	require_once('JSONPath/JSONPath.php');
+	require_once('JSONPath/JSONPathLexer.php');
+	require_once('JSONPath/JSONPathException.php');
+	require_once('JSONPath/Filters/AbstractFilter.php');
+	require_once('JSONPath/Filters/IndexesFilter.php');
+	require_once('JSONPath/Filters/IndexFilter.php');
+	require_once('JSONPath/Filters/QueryMatchFilter.php');
+	require_once('JSONPath/Filters/QueryResultFilter.php');
+	require_once('JSONPath/Filters/RecursiveFilter.php');
+	require_once('JSONPath/Filters/SliceFilter.php');
+	require_once('JSONPath/Filters/LoadFilter.php');
 }
 
 
@@ -41,17 +41,17 @@ 
 	 * @param string $title The predicate used to set the title of the page, default *rdfs:label*.
 	 * @param string $language The language for values, default *en*.
 	 */
-	function __construct( $base_uri = null, $suffix = '.json', $title = 'rdfs:label', $language = 'en' ) {
+	function __construct($base_uri = null, $suffix = '.json', $title = 'rdfs:label', $language = 'en') {
 
 		// Set the instance variables.
-		$this->base_uri = ( null === $base_uri ? wl_configuration_get_redlink_dataset_uri() : $base_uri );
+		$this->base_uri = (null === $base_uri ? wl_configuration_get_redlink_dataset_uri() : $base_uri);
 		$this->suffix   = $suffix;
 		$this->title    = $title;
 		$this->language = $language;
 
-		wl_write_log( "[ base URI :: $this->base_uri ][ suffix :: $this->suffix ][ title :: $this->title ][ language :: $this->language ]" );
+		wl_write_log("[ base URI :: $this->base_uri ][ suffix :: $this->suffix ][ title :: $this->title ][ language :: $this->language ]");
 
-		add_filter( 'wp_title', array( $this, 'filter_page_title' ), 10, 2 );
+		add_filter('wp_title', array($this, 'filter_page_title'), 10, 2);
 	}
 
 
@@ -68,12 +68,12 @@ 
 	 * @param string $sep   The title separator.
 	 * @return string The new title.
 	 */
-	function filter_page_title( $title, $sep ) {
+	function filter_page_title($title, $sep) {
 
 		$expr       = "$['$this->title'][?(@.@language=='$this->language')].@value";
-		$view_title = $this->get_first_property_html( $expr );
+		$view_title = $this->get_first_property_html($expr);
 
-		return $view_title . " $sep $title";
+		return $view_title." $sep $title";
 
 	}
 
@@ -88,20 +88,20 @@ 
 	 *
 	 * @param string $path The entity path.
 	 */
-	function load( $path = null ) {
+	function load($path = null) {
 
 		// If the path is empty, load the resource from the query string variable.
-		if ( empty( $path ) ) {
-			$path = get_query_var( WL_ENTITY_VIEW_ENTITY_ID_QUERY_VAR );
+		if (empty($path)) {
+			$path = get_query_var(WL_ENTITY_VIEW_ENTITY_ID_QUERY_VAR);
 		}
 
 		// If a base URI has been set, append the path, otherwise use the path.
-		$this->url = ( ! empty( $this->base_uri )
-			? $this->base_uri . ( '/' !== substr( $this->base_uri, - 1, 1 ) ? '/' : '' ) . $path
-			: $path );
+		$this->url = ( ! empty($this->base_uri)
+			? $this->base_uri.('/' !== substr($this->base_uri, - 1, 1) ? '/' : '').$path
+			: $path);
 
-		$this->graph     = wl_jsonld_load_remote( $this->url . $this->suffix );
-		$this->json_path = new JSONPath( $this->graph );
+		$this->graph     = wl_jsonld_load_remote($this->url.$this->suffix);
+		$this->json_path = new JSONPath($this->graph);
 
 	}
 
@@ -117,37 +117,37 @@ 
 	 *
 	 * @return string|array The property value.
 	 */
-	function get_property( $name, $index = NULL ) {
+	function get_property($name, $index = NULL) {
 
 
-		$values = $this->json_path->find( $this->expand( $name ) );
+		$values = $this->json_path->find($this->expand($name));
 
-		wl_write_log( "[ name :: $name ][ index :: $index ][ value :: " . var_export( $values, true ) . " ]" );
+		wl_write_log("[ name :: $name ][ index :: $index ][ value :: ".var_export($values, true)." ]");
 
 
-		return ( NULL !== $index ? $values[ $index ] : $values );
+		return (NULL !== $index ? $values[$index] : $values);
 
 //		$value = wl_jsonld_get_property( $this->graph, $name, $language, $this->suffix, $index );
 //		return $value;
 
 	}
 
-	function expand( $expr ) {
+	function expand($expr) {
 
-		foreach ( wl_prefixes_list() as $item ) {
+		foreach (wl_prefixes_list() as $item) {
 			$prefix    = $item['prefix'];
 			$namespace = $item['namespace'];
-			$expr      = preg_replace( "/(['\"])$prefix:/", "\${1}$namespace", $expr );
-			$expr      = preg_replace( "/\\.$prefix:([^.]+)\\./", "['$namespace\${1}']", $expr );
+			$expr      = preg_replace("/(['\"])$prefix:/", "\${1}$namespace", $expr);
+			$expr      = preg_replace("/\\.$prefix:([^.]+)\\./", "['$namespace\${1}']", $expr);
 		}
 
 
 		return $expr;
 	}
 
-	function get_property_html( $name, $index = 0 ) {
+	function get_property_html($name, $index = 0) {
 
-		return esc_html( $this->get_property( $name, $index ) );
+		return esc_html($this->get_property($name, $index));
 
 	}
 
@@ -162,9 +162,9 @@ 
 	 *
 	 * @return string The value.
 	 */
-	function get_first_property_html( $name ) {
+	function get_first_property_html($name) {
 
-		return esc_html( $this->get_first_property( $name ) );
+		return esc_html($this->get_first_property($name));
 
 	}
 
@@ -179,16 +179,16 @@ 
 	 *
 	 * @return string The value.
 	 */
-	function get_first_property( $name ) {
+	function get_first_property($name) {
 
-		return $this->get_property( $name, 0 );
+		return $this->get_property($name, 0);
 
 	}
 
 
-	function echo_property( $name, $index = 0 ) {
+	function echo_property($name, $index = 0) {
 
-		echo $this->get_property( $name, $index );
+		echo $this->get_property($name, $index);
 
 	}
 
@@ -199,15 +199,15 @@ 
 	 *
 	 * @return string
 	 */
-	function get_property_localized( $name ) {
+	function get_property_localized($name) {
 
-		return $this->get_property( $this->localize_expression( $name ) );
+		return $this->get_property($this->localize_expression($name));
 
 	}
 
-	function get_first_property_localized( $name ) {
+	function get_first_property_localized($name) {
 
-		return $this->get_first_property( $this->localize_expression( $name ) );
+		return $this->get_first_property($this->localize_expression($name));
 
 	}
 
@@ -218,9 +218,9 @@ 
 	 *
 	 * @return string
 	 */
-	function get_first_property_html_localized( $name ) {
+	function get_first_property_html_localized($name) {
 
-		return esc_html( $this->get_first_property_localized( $name ) );
+		return esc_html($this->get_first_property_localized($name));
 
 	}
 
@@ -233,9 +233,9 @@ 
 	 *
 	 * @return string The localized expression.
 	 */
-	function localize_expression( $name ) {
+	function localize_expression($name) {
 
-		return $name . "[?(@.@language=='$this->language')].@value";
+		return $name."[?(@.@language=='$this->language')].@value";
 
 	}
 

src/modules/entity_view/JSONPath/JSONPathLexer.php

Doc Comments +3 added lines

@@ -36,6 +36,9 @@
     const MATCH_LOAD         = '\s* !\(.+?\) \s*';
 
 
+    /**
+     * @param string $expression
+     */
     public function __construct($expression)
     {
         $this->expression = $expression;

Spacing +11 added lines, -11 removed lines

@@ -45,7 +45,7 @@ 
     {
         $tokens = [];
 
-        $regex = '/(' . implode(')|(', $this->getCatchablePatterns()) . ')/i';
+        $regex = '/('.implode(')|(', $this->getCatchablePatterns()).')/i';
 
         $flags   = PREG_SPLIT_NO_EMPTY | PREG_SPLIT_DELIM_CAPTURE | PREG_SPLIT_OFFSET_CAPTURE;
         $matches = preg_split($regex, $this->expression, -1, $flags);
@@ -84,20 +84,20 @@ 
     protected function getType(&$value)
     {
 
-        if (preg_match('/^' . static::GROUP_DOT_INDEX . '$/x', $value)) {
+        if (preg_match('/^'.static::GROUP_DOT_INDEX.'$/x', $value)) {
             $value = substr($value, 1);
             return self::T_INDEX;
         }
 
-        if (preg_match('/^' . static::GROUP_RECURSIVE_INDEX . '$/x', $value)) {
+        if (preg_match('/^'.static::GROUP_RECURSIVE_INDEX.'$/x', $value)) {
             $value = substr($value, 2);
             return self::T_RECURSIVE;
         }
 
-        if (preg_match('/^' . static::GROUP_BRACKET . '$/x', $value)) {
+        if (preg_match('/^'.static::GROUP_BRACKET.'$/x', $value)) {
             $value = substr($value, 1, -1);
 
-            if (preg_match('/^' . static::MATCH_LOAD . '$/x', $value)) {
+            if (preg_match('/^'.static::MATCH_LOAD.'$/x', $value)) {
 
 //                var_dump( 'I am a remote load' );
                 $value = substr($value, 2, -1);
@@ -106,11 +106,11 @@ 
 
             }
 
-            if (preg_match('/^(' . static::MATCH_INDEX . ')$/x', $value, $bracketMatches)) {
+            if (preg_match('/^('.static::MATCH_INDEX.')$/x', $value, $bracketMatches)) {
                 return self::T_INDEX;
             }
 
-            if (preg_match('/^' . static::MATCH_INDEXES . '$/x', $value, $bracketMatches)) {
+            if (preg_match('/^'.static::MATCH_INDEXES.'$/x', $value, $bracketMatches)) {
                 $value = explode(',', $value);
                 foreach ($value as & $v) {
                     $v = (int) trim($v);
@@ -118,7 +118,7 @@ 
                 return self::T_INDEXES;
             }
 
-            if (preg_match('/^' . static::MATCH_SLICE . '$/x', $value, $bracketMatches)) {
+            if (preg_match('/^'.static::MATCH_SLICE.'$/x', $value, $bracketMatches)) {
                 $parts = explode(':', $value);
 
                 $value = [
@@ -130,19 +130,19 @@ 
                 return self::T_SLICE;
             }
 
-            if (preg_match('/^' . static::MATCH_QUERY_RESULT . '$/x', $value)) {
+            if (preg_match('/^'.static::MATCH_QUERY_RESULT.'$/x', $value)) {
                 $value = substr($value, 1, -1);
 
                 return self::T_QUERY_RESULT;
             }
 
-            if (preg_match('/^' . static::MATCH_QUERY_MATCH . '$/x', $value)) {
+            if (preg_match('/^'.static::MATCH_QUERY_MATCH.'$/x', $value)) {
                 $value = substr($value, 2, -1);
 
                 return self::T_QUERY_MATCH;
             }
 
-            if (preg_match('/^' . static::MATCH_INDEX_ALT . '$/x', $value, $bracketMatches)) {
+            if (preg_match('/^'.static::MATCH_INDEX_ALT.'$/x', $value, $bracketMatches)) {
                 $value = $bracketMatches[1];
                 $value = trim($value);
 

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 +177 added lines, -177 removed lines

@@ -14,48 +14,48 @@ 
  */
 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 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 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 $place_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
-	$places = get_posts( array(
-		'post__in'    => $related_ids,
-		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
-		'nopaging'    => true,
-		'post_status' => 'published',
-		'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' => '!=',
-			)
-		)
-	) );
-
-	return $places;
+    // 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 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 $place_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
+    $places = get_posts( array(
+        'post__in'    => $related_ids,
+        'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
+        'nopaging'    => true,
+        'post_status' => 'published',
+        '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' => '!=',
+            )
+        )
+    ) );
+
+    return $places;
 }
 
 /**
@@ -70,88 +70,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 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 ) {
-
-		// 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;
-		}
-
-		// 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] );
-		}
-
-		// 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>";
-
-		// 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;
-
-		// 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;
-
-	return $map_data;
+    // 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();
+
+    // Add a POI for each entity that has coordinates.
+    foreach ( $places as $entity ) {
+
+        // 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;
+        }
+
+        // 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] );
+        }
+
+        // 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>";
+
+        // 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;
+
+        // 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;
+
+    return $map_data;
 }
 
 /**
@@ -165,13 +165,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' );
@@ -186,54 +186,54 @@ 
  */
 function wl_shortcode_geomap( $atts ) {
 
-	// Extract attributes and set default values.
-	$geomap_atts = shortcode_atts( array(
-		'width'  => '100%',
-		'height' => '300px',
-		'global' => false
-	), $atts );
-
-	// Get id of the post
-	$post_id = get_the_ID();
-
-	if ( $geomap_atts['global'] || is_null( $post_id ) ) {
-		// Global geomap
-		$geomap_id = 'wl_geomap_global';
-		$post_id   = null;
-	} else {
-		// Post-specific geomap
-		$geomap_id = 'wl_geomap_' . $post_id;
-	}
-
-	// Add leaflet css and library.
-	wp_enqueue_style(
-		'leaflet',
-		dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
-	);
-	wp_enqueue_script(
-		'leaflet',
-		dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
-	);
-
-	// Add wordlift-ui css and library.
-	wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-
-	wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
-
-	wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-		'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
-		'action'   => 'wl_geomap'            // Global param
-	) );
-
-	// Escaping atts.
-	$esc_class   = esc_attr( 'wl-geomap' );
-	$esc_id      = esc_attr( $geomap_id );
-	$esc_width   = esc_attr( $geomap_atts['width'] );
-	$esc_height  = esc_attr( $geomap_atts['height'] );
-	$esc_post_id = esc_attr( $post_id );
-
-	// Return HTML template.
-	return <<<EOF
+    // Extract attributes and set default values.
+    $geomap_atts = shortcode_atts( array(
+        'width'  => '100%',
+        'height' => '300px',
+        'global' => false
+    ), $atts );
+
+    // Get id of the post
+    $post_id = get_the_ID();
+
+    if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+        // Global geomap
+        $geomap_id = 'wl_geomap_global';
+        $post_id   = null;
+    } else {
+        // Post-specific geomap
+        $geomap_id = 'wl_geomap_' . $post_id;
+    }
+
+    // Add leaflet css and library.
+    wp_enqueue_style(
+        'leaflet',
+        dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
+    );
+    wp_enqueue_script(
+        'leaflet',
+        dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
+    );
+
+    // Add wordlift-ui css and library.
+    wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+
+    wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
+
+    wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
+        'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+        'action'   => 'wl_geomap'            // Global param
+    ) );
+
+    // Escaping atts.
+    $esc_class   = esc_attr( 'wl-geomap' );
+    $esc_id      = esc_attr( $geomap_id );
+    $esc_width   = esc_attr( $geomap_atts['width'] );
+    $esc_height  = esc_attr( $geomap_atts['height'] );
+    $esc_post_id = esc_attr( $post_id );
+
+    // Return HTML template.
+    return <<<EOF
 <div class="$esc_class" 
 	id="$esc_id"
 	data-post-id="$esc_post_id"

Spacing +54 added lines, -54 removed lines

@@ -12,30 +12,30 @@ 
  *
  * @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'
-		) );
+		));
 	}
 
 	// 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 $place_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
-	$places = get_posts( array(
+	$places = get_posts(array(
 		'post__in'    => $related_ids,
 		'post_type'   => Wordlift_Entity_Service::TYPE_NAME,
 		'nopaging'    => true,
@@ -53,7 +53,7 @@ 
 				'compare' => '!=',
 			)
 		)
-	) );
+	));
 
 	return $places;
 }
@@ -68,7 +68,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;
@@ -83,13 +83,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;
 		}
 
@@ -97,38 +97,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(
@@ -143,7 +143,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']);
 
 	}
 
@@ -166,16 +166,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
@@ -184,53 +184,53 @@ 
  *
  * @return string A dom element represneting a geomap.
  */
-function wl_shortcode_geomap( $atts ) {
+function wl_shortcode_geomap($atts) {
 
 	// Extract attributes and set default values.
-	$geomap_atts = shortcode_atts( array(
+	$geomap_atts = shortcode_atts(array(
 		'width'  => '100%',
 		'height' => '300px',
 		'global' => false
-	), $atts );
+	), $atts);
 
 	// Get id of the post
 	$post_id = get_the_ID();
 
-	if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+	if ($geomap_atts['global'] || is_null($post_id)) {
 		// Global geomap
 		$geomap_id = 'wl_geomap_global';
 		$post_id   = null;
 	} else {
 		// Post-specific geomap
-		$geomap_id = 'wl_geomap_' . $post_id;
+		$geomap_id = 'wl_geomap_'.$post_id;
 	}
 
 	// Add leaflet css and library.
 	wp_enqueue_style(
 		'leaflet',
-		dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.css'
+		dirname(plugin_dir_url(__FILE__)).'/bower_components/leaflet/dist/leaflet.css'
 	);
 	wp_enqueue_script(
 		'leaflet',
-		dirname( plugin_dir_url( __FILE__ ) ) . '/bower_components/leaflet/dist/leaflet.js'
+		dirname(plugin_dir_url(__FILE__)).'/bower_components/leaflet/dist/leaflet.js'
 	);
 
 	// Add wordlift-ui css and library.
-	wp_enqueue_style( 'wordlift-ui-css', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui-css', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
-	wp_enqueue_script( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/js/wordlift-ui.min.js', array( 'jquery' ) );
+	wp_enqueue_script('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/js/wordlift-ui.min.js', array('jquery'));
 
-	wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-		'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+	wp_localize_script('wordlift-ui', 'wl_geomap_params', array(
+		'ajax_url' => admin_url('admin-ajax.php'), // Global param
 		'action'   => 'wl_geomap'            // Global param
-	) );
+	));
 
 	// Escaping atts.
-	$esc_class   = esc_attr( 'wl-geomap' );
-	$esc_id      = esc_attr( $geomap_id );
-	$esc_width   = esc_attr( $geomap_atts['width'] );
-	$esc_height  = esc_attr( $geomap_atts['height'] );
-	$esc_post_id = esc_attr( $post_id );
+	$esc_class   = esc_attr('wl-geomap');
+	$esc_id      = esc_attr($geomap_id);
+	$esc_width   = esc_attr($geomap_atts['width']);
+	$esc_height  = esc_attr($geomap_atts['height']);
+	$esc_post_id = esc_attr($post_id);
 
 	// Return HTML template.
 	return <<<EOF
@@ -246,4 +246,4 @@ 
 
 }
 
-add_shortcode( 'wl_geomap', 'wl_shortcode_geomap' );
\ No newline at end of file
+add_shortcode('wl_geomap', 'wl_shortcode_geomap');
\ No newline at end of file

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 +225 added lines, -225 removed lines

@@ -26,7 +26,7 @@ 
 
 // If this file is called directly, abort.
 if ( ! defined( 'WPINC' ) ) {
-	die;
+    die;
 }
 
 // Include WordLift constants.
@@ -47,18 +47,18 @@ 
  */
 function wl_write_log( $log ) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+    $handler = apply_filters( 'wl_write_log_handler', null );
 
-	$callers         = debug_backtrace();
-	$caller_function = $callers[1]['function'];
+    $callers         = debug_backtrace();
+    $caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+    if ( is_null( $handler ) ) {
+        wl_write_log_handler( $log, $caller_function );
 
-		return;
-	}
+        return;
+    }
 
-	call_user_func( $handler, $log, $caller_function );
+    call_user_func( $handler, $log, $caller_function );
 }
 
 /**
@@ -71,20 +71,20 @@ 
  */
 function wl_write_log_handler( $log, $caller = null ) {
 
-	global $wl_logger;
+    global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+    if ( true === WP_DEBUG ) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+        $message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
+                    ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
-		} else {
-			error_log( $message );
-		}
+        if ( isset( $wl_logger ) ) {
+            $wl_logger->info( $message );
+        } else {
+            error_log( $message );
+        }
 
-	}
+    }
 
 }
 
@@ -99,7 +99,7 @@ 
  */
 function wl_write_log_hide_key( $text ) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+    return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
 }
 
 /**
@@ -111,10 +111,10 @@ 
  */
 function wl_queue_sparql_update_query( $query ) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+    $filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+    file_put_contents( $filename, $query . "\n", FILE_APPEND );
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
 }
 
 /**
@@ -124,28 +124,28 @@ 
  */
 function wl_execute_saved_sparql_update_query( $request_id ) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+    $filename = WL_TEMP_DIR . $request_id . '.sparql';
 
-	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+    // If the file doesn't exist, exit.
+    if ( ! file_exists( $filename ) ) {
+        wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
 
-		return;
-	}
+        return;
+    }
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+    wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
 
-	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+    // Get the query saved in the file.
+    $query = file_get_contents( $filename );
 
-	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+    // Execute the SPARQL query.
+    rl_execute_sparql_update_query( $query, false );
 
-	// Reindex the triple store.
-	wordlift_reindex_triple_store();
+    // Reindex the triple store.
+    wordlift_reindex_triple_store();
 
-	// Delete the temporary file.
-	unlink( $filename );
+    // Delete the temporary file.
+    unlink( $filename );
 }
 
 add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
@@ -155,10 +155,10 @@ 
  */
 function wordlift_buttonhooks() {
 
-	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
-	}
+    // Only add hooks when the current user has permissions AND is in Rich Text editor mode
+    if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
+        add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+    }
 }
 
 /**
@@ -170,10 +170,10 @@ 
  */
 function wordlift_register_tinymce_javascript( $plugin_array ) {
 
-	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+    // add the wordlift plugin.
+    $plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
 
-	return $plugin_array;
+    return $plugin_array;
 }
 
 /**
@@ -181,21 +181,21 @@ 
  * see http://vip.wordpress.com/documentation/register-additional-html-attributes-for-tinymce-and-wp-kses/
  */
 function wordlift_allowed_post_tags() {
-	global $allowedposttags;
-
-	$tags           = array( 'span' );
-	$new_attributes = array(
-		'itemscope' => array(),
-		'itemtype'  => array(),
-		'itemprop'  => array(),
-		'itemid'    => array()
-	);
-
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
-		}
-	}
+    global $allowedposttags;
+
+    $tags           = array( 'span' );
+    $new_attributes = array(
+        'itemscope' => array(),
+        'itemtype'  => array(),
+        'itemprop'  => array(),
+        'itemid'    => array()
+    );
+
+    foreach ( $tags as $tag ) {
+        if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
+            $allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+        }
+    }
 }
 
 // init process for button control
@@ -209,21 +209,21 @@ 
  */
 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', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
+    wp_enqueue_script( 'jquery-ui-autocomplete' );
+    wp_enqueue_script( 'angularjs', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
 
 }
 
 add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
 
 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' );
@@ -238,18 +238,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 );
@@ -263,15 +263,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] : ''
+    );
 }
 
 /**
@@ -283,13 +283,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;
 }
 
 /**
@@ -301,34 +301,34 @@ 
  */
 function wl_get_image_urls( $post_id ) {
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
-		'post_parent'    => $post_id,
-		'post_type'      => 'attachment',
-		'post_mime_type' => 'image'
-	) );
+    $images = get_children( array(
+        'post_parent'    => $post_id,
+        'post_type'      => 'attachment',
+        'post_mime_type' => 'image'
+    ) );
 
-	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
-		return array();
-	}
+    // Return an empty array if no image is found.
+    if ( empty( $images ) ) {
+        return array();
+    }
 
-	// Prepare the return array.
-	$image_urls = array();
+    // Prepare the return array.
+    $image_urls = array();
 
-	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
-		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
-		}
-	}
+    // Collect the URLs.
+    foreach ( $images as $attachment_id => $attachment ) {
+        $image_url = wp_get_attachment_url( $attachment_id );
+        // Ensure the URL isn't collected already.
+        if ( ! in_array( $image_url, $image_urls ) ) {
+            array_push( $image_urls, $image_url );
+        }
+    }
 
-	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
+    // wl_write_log( "wl_get_image_urls [ post id :: $post_id ][ image urls count :: " . count( $image_urls ) . " ]" );
 
-	return $image_urls;
+    return $image_urls;
 }
 
 /**
@@ -341,19 +341,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;
 }
 
 /**
@@ -366,24 +366,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;
 }
 
 /**
@@ -394,8 +394,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 );
 }
 
 
@@ -413,43 +413,43 @@ 
  */
 function wl_flush_rewrite_rules_hard( $hard ) {
 
-	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
-		'post_type'      => 'any',
-		'post_status'    => 'publish'
-	) );
+    // Get all published posts.
+    $posts = get_posts( array(
+        'posts_per_page' => - 1,
+        'post_type'      => 'any',
+        'post_status'    => 'publish'
+    ) );
 
-	// Holds the delete part of the query.
-	$delete_query = rl_sparql_prefixes();
-	// Holds the insert part of the query.
-	$insert_query = 'INSERT DATA { ';
+    // Holds the delete part of the query.
+    $delete_query = rl_sparql_prefixes();
+    // Holds the insert part of the query.
+    $insert_query = 'INSERT DATA { ';
 
-	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+    // Cycle in each post to build the query.
+    foreach ( $posts as $post ) {
 
-		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
-			continue;
-		}
+        // Ignore revisions.
+        if ( wp_is_post_revision( $post->ID ) ) {
+            continue;
+        }
 
-		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+        // Get the entity URI.
+        $uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
 
-		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+        // Get the post URL.
+        $url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
 
-		// Prepare the DELETE and INSERT commands.
-		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
-		$insert_query .= " <$uri> schema:url <$url> . \n";
+        // Prepare the DELETE and INSERT commands.
+        $delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
+        $insert_query .= " <$uri> schema:url <$url> . \n";
 
-		// wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
-	}
+        // wl_write_log( "[ uri :: $uri ][ url :: $url ]" );
+    }
 
-	$insert_query .= ' };';
+    $insert_query .= ' };';
 
-	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+    // Execute the query.
+    rl_execute_sparql_update_query( $delete_query . $insert_query );
 }
 
 add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
@@ -466,15 +466,15 @@ 
  */
 function wl_sanitize_uri_path( $path, $char = '_' ) {
 
-	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
+    // wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
-	// According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
-	// ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
-	// "$" | ","
-	// Plus the ' ' (space).
-	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
+    // According to RFC2396 (http://www.ietf.org/rfc/rfc2396.txt) these characters are reserved:
+    // ";" | "/" | "?" | ":" | "@" | "&" | "=" | "+" |
+    // "$" | ","
+    // Plus the ' ' (space).
+    // TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+    return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
 }
 
 /**
@@ -482,26 +482,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' );
@@ -515,45 +515,45 @@ 
  */
 function wl_replace_item_id_with_uri( $content ) {
 
-	// wl_write_log( "wl_replace_item_id_with_uri" );
+    // wl_write_log( "wl_replace_item_id_with_uri" );
 
-	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+    // Strip slashes, see https://core.trac.wordpress.org/ticket/21767
+    $content = stripslashes( $content );
 
-	// If any match are found.
-	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+    // If any match are found.
+    $matches = array();
+    if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
 
-		foreach ( $matches as $match ) {
+        foreach ( $matches as $match ) {
 
-			// Get the item ID.
-			$item_id = $match[1];
+            // Get the item ID.
+            $item_id = $match[1];
 
-			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = wl_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 = wl_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 );
@@ -585,7 +585,7 @@ 
 
 // Entity view shortcode just with php >= 5.4
 if ( version_compare( phpversion(), '5.4.0', '>=' ) ) {
-	require_once( 'modules/entity_view/wordlift_entity_view.php' );
+    require_once( 'modules/entity_view/wordlift_entity_view.php' );
 }
 
 require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
@@ -642,8 +642,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();
 }
 
 /**
@@ -651,8 +651,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' );
@@ -675,8 +675,8 @@ 
  */
 function run_wordlift() {
 
-	$plugin = new Wordlift();
-	$plugin->run();
+    $plugin = new Wordlift();
+    $plugin->run();
 
 }
 

Spacing +156 added lines, -156 removed lines

@@ -25,16 +25,16 @@ 
  */
 
 // If this file is called directly, abort.
-if ( ! defined( 'WPINC' ) ) {
+if ( ! defined('WPINC')) {
 	die;
 }
 
 // Include WordLift constants.
-require_once( 'wordlift_constants.php' );
+require_once('wordlift_constants.php');
 
 // Load modules
-require_once( 'modules/core/wordlift_core.php' );
-require_once( 'modules/configuration/wordlift_configuration.php' );
+require_once('modules/core/wordlift_core.php');
+require_once('modules/configuration/wordlift_configuration.php');
 
 /**
  * Log to the debug.log file.
@@ -45,20 +45,20 @@ 
  *
  * @param string|mixed $log The log data.
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	$handler = apply_filters( 'wl_write_log_handler', null );
+	$handler = apply_filters('wl_write_log_handler', null);
 
 	$callers         = debug_backtrace();
 	$caller_function = $callers[1]['function'];
 
-	if ( is_null( $handler ) ) {
-		wl_write_log_handler( $log, $caller_function );
+	if (is_null($handler)) {
+		wl_write_log_handler($log, $caller_function);
 
 		return;
 	}
 
-	call_user_func( $handler, $log, $caller_function );
+	call_user_func($handler, $log, $caller_function);
 }
 
 /**
@@ -69,19 +69,19 @@ 
  * @param string|array $log The log data.
  * @param string $caller The calling function.
  */
-function wl_write_log_handler( $log, $caller = null ) {
+function wl_write_log_handler($log, $caller = null) {
 
 	global $wl_logger;
 
-	if ( true === WP_DEBUG ) {
+	if (true === WP_DEBUG) {
 
-		$message = ( isset( $caller ) ? sprintf( '[%-40.40s] ', $caller ) : '' ) .
-		           ( is_array( $log ) || is_object( $log ) ? print_r( $log, true ) : wl_write_log_hide_key( $log ) );
+		$message = (isset($caller) ? sprintf('[%-40.40s] ', $caller) : '').
+		           (is_array($log) || is_object($log) ? print_r($log, true) : wl_write_log_hide_key($log));
 
-		if ( isset( $wl_logger ) ) {
-			$wl_logger->info( $message );
+		if (isset($wl_logger)) {
+			$wl_logger->info($message);
 		} else {
-			error_log( $message );
+			error_log($message);
 		}
 
 	}
@@ -97,9 +97,9 @@ 
  *
  * @return string A text with the key hidden.
  */
-function wl_write_log_hide_key( $text ) {
+function wl_write_log_hide_key($text) {
 
-	return str_ireplace( wl_configuration_get_key(), '<hidden>', $text );
+	return str_ireplace(wl_configuration_get_key(), '<hidden>', $text);
 }
 
 /**
@@ -109,12 +109,12 @@ 
  *
  * @param string $query A SPARQL query.
  */
-function wl_queue_sparql_update_query( $query ) {
+function wl_queue_sparql_update_query($query) {
 
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
-	file_put_contents( $filename, $query . "\n", FILE_APPEND );
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
+	file_put_contents($filename, $query."\n", FILE_APPEND);
 
-	wl_write_log( "wl_queue_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_queue_sparql_update_query [ filename :: $filename ]");
 }
 
 /**
@@ -122,33 +122,33 @@ 
  *
  * @param int $request_id The request ID.
  */
-function wl_execute_saved_sparql_update_query( $request_id ) {
+function wl_execute_saved_sparql_update_query($request_id) {
 
-	$filename = WL_TEMP_DIR . $request_id . '.sparql';
+	$filename = WL_TEMP_DIR.$request_id.'.sparql';
 
 	// If the file doesn't exist, exit.
-	if ( ! file_exists( $filename ) ) {
-		wl_write_log( "wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]" );
+	if ( ! file_exists($filename)) {
+		wl_write_log("wl_execute_saved_sparql_update_query : file doesn't exist [ filename :: $filename ]");
 
 		return;
 	}
 
-	wl_write_log( "wl_execute_saved_sparql_update_query [ filename :: $filename ]" );
+	wl_write_log("wl_execute_saved_sparql_update_query [ filename :: $filename ]");
 
 	// Get the query saved in the file.
-	$query = file_get_contents( $filename );
+	$query = file_get_contents($filename);
 
 	// Execute the SPARQL query.
-	rl_execute_sparql_update_query( $query, false );
+	rl_execute_sparql_update_query($query, false);
 
 	// Reindex the triple store.
 	wordlift_reindex_triple_store();
 
 	// Delete the temporary file.
-	unlink( $filename );
+	unlink($filename);
 }
 
-add_action( 'wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1 );
+add_action('wl_execute_saved_sparql_update_query', 'wl_execute_saved_sparql_update_query', 10, 1);
 
 /**
  * Add buttons hook for the TinyMCE editor. This method is called by the WP init hook.
@@ -156,8 +156,8 @@ 
 function wordlift_buttonhooks() {
 
 	// Only add hooks when the current user has permissions AND is in Rich Text editor mode
-	if ( ( current_user_can( 'edit_posts' ) || current_user_can( 'edit_pages' ) ) && get_user_option( 'rich_editing' ) ) {
-		add_filter( 'mce_external_plugins', 'wordlift_register_tinymce_javascript' );
+	if ((current_user_can('edit_posts') || current_user_can('edit_pages')) && get_user_option('rich_editing')) {
+		add_filter('mce_external_plugins', 'wordlift_register_tinymce_javascript');
 	}
 }
 
@@ -168,10 +168,10 @@ 
  *
  * @return array The modified plugins array.
  */
-function wordlift_register_tinymce_javascript( $plugin_array ) {
+function wordlift_register_tinymce_javascript($plugin_array) {
 
 	// add the wordlift plugin.
-	$plugin_array['wordlift'] = plugin_dir_url( __FILE__ ) . 'js/wordlift-reloaded.js';
+	$plugin_array['wordlift'] = plugin_dir_url(__FILE__).'js/wordlift-reloaded.js';
 
 	return $plugin_array;
 }
@@ -183,7 +183,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -191,17 +191,17 @@ 
 		'itemid'    => array()
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // init process for button control
-add_action( 'init', 'wordlift_buttonhooks' );
+add_action('init', 'wordlift_buttonhooks');
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 
 /**
@@ -210,23 +210,23 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
-	wp_enqueue_script( 'angularjs', plugin_dir_url( __FILE__ ) . 'bower_components/angular/angular.min.js' );
+	wp_enqueue_script('jquery-ui-autocomplete');
+	wp_enqueue_script('angularjs', plugin_dir_url(__FILE__).'bower_components/angular/angular.min.js');
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 function wl_enqueue_scripts() {
-	wp_enqueue_style( 'wordlift-ui', plugin_dir_url( __FILE__ ) . 'css/wordlift-ui.min.css' );
+	wp_enqueue_style('wordlift-ui', plugin_dir_url(__FILE__).'css/wordlift-ui.min.css');
 }
 
-add_action( 'wp_enqueue_scripts', 'wl_enqueue_scripts' );
+add_action('wp_enqueue_scripts', 'wl_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -236,23 +236,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true
 		)
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get the coordinates for the specified post ID.
@@ -261,16 +261,16 @@ 
  *
  * @return array|null An array of coordinates or null.
  */
-function wl_get_coordinates( $post_id ) {
+function wl_get_coordinates($post_id) {
 
-	$latitude  = wl_schema_get_value( $post_id, 'latitude' );
-	$longitude = wl_schema_get_value( $post_id, 'longitude' );
+	$latitude  = wl_schema_get_value($post_id, 'latitude');
+	$longitude = wl_schema_get_value($post_id, 'longitude');
 
 	// DO NOT set latitude/longitude to 0/0 as default values. It's a specific place on the globe:
 	// "The zero/zero point of this system is located in the Gulf of Guinea about 625 km (390 mi) south of Tema, Ghana."
 	return array(
-		'latitude'  => isset( $latitude[0] ) && is_numeric( $latitude[0] ) ? $latitude[0] : '',
-		'longitude' => isset( $longitude[0] ) && is_numeric( $longitude[0] ) ? $longitude[0] : ''
+		'latitude'  => isset($latitude[0]) && is_numeric($latitude[0]) ? $latitude[0] : '',
+		'longitude' => isset($longitude[0]) && is_numeric($longitude[0]) ? $longitude[0] : ''
 	);
 }
 
@@ -281,12 +281,12 @@ 
  *
  * @return string A datetime.
  */
-function wl_get_post_modified_time( $post ) {
+function wl_get_post_modified_time($post) {
 
-	$date_modified = get_post_modified_time( 'c', true, $post );
+	$date_modified = get_post_modified_time('c', true, $post);
 
-	if ( '-' === substr( $date_modified, 0, 1 ) ) {
-		return get_the_time( 'c', $post );
+	if ('-' === substr($date_modified, 0, 1)) {
+		return get_the_time('c', $post);
 	}
 
 	return $date_modified;
@@ -299,18 +299,18 @@ 
  *
  * @return array An array of image URLs.
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	// wl_write_log( "wl_get_image_urls [ post id :: $post_id ]" );
 
-	$images = get_children( array(
+	$images = get_children(array(
 		'post_parent'    => $post_id,
 		'post_type'      => 'attachment',
 		'post_mime_type' => 'image'
-	) );
+	));
 
 	// Return an empty array if no image is found.
-	if ( empty( $images ) ) {
+	if (empty($images)) {
 		return array();
 	}
 
@@ -318,11 +318,11 @@ 
 	$image_urls = array();
 
 	// Collect the URLs.
-	foreach ( $images as $attachment_id => $attachment ) {
-		$image_url = wp_get_attachment_url( $attachment_id );
+	foreach ($images as $attachment_id => $attachment) {
+		$image_url = wp_get_attachment_url($attachment_id);
 		// Ensure the URL isn't collected already.
-		if ( ! in_array( $image_url, $image_urls ) ) {
-			array_push( $image_urls, $image_url );
+		if ( ! in_array($image_url, $image_urls)) {
+			array_push($image_urls, $image_url);
 		}
 	}
 
@@ -339,17 +339,17 @@ 
  *
  * @return string The SPARQL fragment.
  */
-function wl_get_sparql_images( $uri, $post_id ) {
+function wl_get_sparql_images($uri, $post_id) {
 
 	$sparql = '';
 
 	// Get the escaped URI.
-	$uri_e = esc_html( $uri );
+	$uri_e = esc_html($uri);
 
 	// Add SPARQL stmts to write the schema:image.
-	$image_urls = wl_get_image_urls( $post_id );
-	foreach ( $image_urls as $image_url ) {
-		$image_url_esc = wl_sparql_escape_uri( $image_url );
+	$image_urls = wl_get_image_urls($post_id);
+	foreach ($image_urls as $image_url) {
+		$image_url_esc = wl_sparql_escape_uri($image_url);
 		$sparql .= " <$uri_e> schema:image <$image_url_esc> . \n";
 	}
 
@@ -364,21 +364,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -392,10 +392,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 
@@ -411,14 +411,14 @@ 
  *
  * @param bool $hard True if the rewrite involves configuration updates in Apache/IIS.
  */
-function wl_flush_rewrite_rules_hard( $hard ) {
+function wl_flush_rewrite_rules_hard($hard) {
 
 	// Get all published posts.
-	$posts = get_posts( array(
-		'posts_per_page' => - 1,
+	$posts = get_posts(array(
+		'posts_per_page' => -1,
 		'post_type'      => 'any',
 		'post_status'    => 'publish'
-	) );
+	));
 
 	// Holds the delete part of the query.
 	$delete_query = rl_sparql_prefixes();
@@ -426,18 +426,18 @@ 
 	$insert_query = 'INSERT DATA { ';
 
 	// Cycle in each post to build the query.
-	foreach ( $posts as $post ) {
+	foreach ($posts as $post) {
 
 		// Ignore revisions.
-		if ( wp_is_post_revision( $post->ID ) ) {
+		if (wp_is_post_revision($post->ID)) {
 			continue;
 		}
 
 		// Get the entity URI.
-		$uri = wl_sparql_escape_uri( wl_get_entity_uri( $post->ID ) );
+		$uri = wl_sparql_escape_uri(wl_get_entity_uri($post->ID));
 
 		// Get the post URL.
-		$url = wl_sparql_escape_uri( get_permalink( $post->ID ) );
+		$url = wl_sparql_escape_uri(get_permalink($post->ID));
 
 		// Prepare the DELETE and INSERT commands.
 		$delete_query .= "DELETE { <$uri> schema:url ?u . } WHERE  { <$uri> schema:url ?u . };\n";
@@ -449,10 +449,10 @@ 
 	$insert_query .= ' };';
 
 	// Execute the query.
-	rl_execute_sparql_update_query( $delete_query . $insert_query );
+	rl_execute_sparql_update_query($delete_query.$insert_query);
 }
 
-add_filter( 'flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1 );
+add_filter('flush_rewrite_rules_hard', 'wl_flush_rewrite_rules_hard', 10, 1);
 
 /**
  * Sanitizes an URI path by replacing the non allowed characters with an underscore.
@@ -464,7 +464,7 @@ 
  *
  * @return The sanitized path.
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
 	// wl_write_log( "wl_sanitize_uri_path [ path :: $path ][ char :: $char ]" );
 
@@ -474,7 +474,7 @@ 
 	// Plus the ' ' (space).
 	// TODO: We shall use the same regex used by MediaWiki (http://stackoverflow.com/questions/23114983/mediawiki-wikipedia-url-sanitization-regex)
 
-	return sanitize_title( preg_replace( '/[;\/?:@&=+$,\s]/', $char, stripslashes( $path ) ) );
+	return sanitize_title(preg_replace('/[;\/?:@&=+$,\s]/', $char, stripslashes($path)));
 }
 
 /**
@@ -483,28 +483,28 @@ 
 function wl_shutdown() {
 
 	// Get the filename to the temporary SPARQL file.
-	$filename = WL_TEMP_DIR . WL_REQUEST_ID . '.sparql';
+	$filename = WL_TEMP_DIR.WL_REQUEST_ID.'.sparql';
 
 	// If WordLift is buffering SPARQL queries, we're admins and a buffer exists, then schedule it.
-	if ( WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists( $filename ) ) {
+	if (WL_ENABLE_SPARQL_UPDATE_QUERIES_BUFFERING && is_admin() && file_exists($filename)) {
 
 		// The request ID.
-		$args = array( WL_REQUEST_ID );
+		$args = array(WL_REQUEST_ID);
 
 		// Schedule the execution of the SPARQL query with the request ID.
-		wp_schedule_single_event( time(), 'wl_execute_saved_sparql_update_query', $args );
+		wp_schedule_single_event(time(), 'wl_execute_saved_sparql_update_query', $args);
 
 		// Check that the request is scheduled.
-		$timestamp = wp_next_scheduled( 'wl_execute_saved_sparql_update_query', $args );
+		$timestamp = wp_next_scheduled('wl_execute_saved_sparql_update_query', $args);
 
 		// Spawn the cron.
 		spawn_cron();
 
-		wl_write_log( "wl_shutdown [ request id :: " . WL_REQUEST_ID . " ][ timestamp :: $timestamp ]" );
+		wl_write_log("wl_shutdown [ request id :: ".WL_REQUEST_ID." ][ timestamp :: $timestamp ]");
 	}
 }
 
-add_action( 'shutdown', 'wl_shutdown' );
+add_action('shutdown', 'wl_shutdown');
 
 /**
  * Replaces the *itemid* attributes URIs with the WordLift URIs.
@@ -513,128 +513,128 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
 	// wl_write_log( "wl_replace_item_id_with_uri" );
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
-			$post = wl_get_entity_post_by_uri( $item_id );
+			$post = wl_get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ($item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
-require_once( 'wordlift_entity_type_taxonomy.php' );
+require_once('wordlift_entity_type.php');
+require_once('wordlift_entity_type_taxonomy.php');
 
 // filters the post content when saving posts.
-require_once( 'wordlift_content_filter.php' );
+require_once('wordlift_content_filter.php');
 // add callbacks on post save to notify data changes from wp to redlink triple store
-require_once( 'wordlift_to_redlink_data_push_callbacks.php' );
+require_once('wordlift_to_redlink_data_push_callbacks.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/prefixes/wordlift_prefixes.php' );
-require_once( 'modules/caching/wordlift_caching.php' );
-require_once( 'modules/profiling/wordlift_profiling.php' );
-require_once( 'modules/redirector/wordlift_redirector.php' );
-require_once( 'modules/freebase_image_proxy/wordlift_freebase_image_proxy.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/prefixes/wordlift_prefixes.php');
+require_once('modules/caching/wordlift_caching.php');
+require_once('modules/profiling/wordlift_profiling.php');
+require_once('modules/redirector/wordlift_redirector.php');
+require_once('modules/freebase_image_proxy/wordlift_freebase_image_proxy.php');
 
 // Shortcodes
 
 // Entity view shortcode just with php >= 5.4
-if ( version_compare( phpversion(), '5.4.0', '>=' ) ) {
-	require_once( 'modules/entity_view/wordlift_entity_view.php' );
+if (version_compare(phpversion(), '5.4.0', '>=')) {
+	require_once('modules/entity_view/wordlift_entity_view.php');
 }
 
-require_once( 'modules/geo_widget/wordlift_geo_widget.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/wordlift_shortcode_blog_map.php' );
+require_once('modules/geo_widget/wordlift_geo_widget.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/wordlift_shortcode_blog_map.php');
 
 // disable In-Depth Articles
 //require_once('wordlift_indepth_articles.php');
 
-require_once( 'wordlift_user.php' );
+require_once('wordlift_user.php');
 
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/wordlift_widget_chord.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/wordlift_widget_chord.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
-require_once( 'wordlift_sparql.php' );
-require_once( 'wordlift_redlink.php' );
+require_once('wordlift_sparql.php');
+require_once('wordlift_redlink.php');
 
-require_once( 'modules/sparql/wordlift_sparql.php' );
+require_once('modules/sparql/wordlift_sparql.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the 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');
 
 
 /**
@@ -642,7 +642,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();
 }
 
@@ -651,18 +651,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.php

Indentation +246 added lines, -246 removed lines

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

Spacing +58 added lines, -58 removed lines

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

src/admin/WL_Metabox/WL_Metabox_Field.php

Indentation +246 added lines, -246 removed lines

@@ -7,257 +7,257 @@
  */
 class WL_Metabox_Field {
 
-	public $meta_name;
-	public $raw_custom_field;
-	public $predicate;
-	public $label;
-	public $expected_wl_type;
-	public $expected_uri_type;
-	public $cardinality;
-	public $data;
-
-	/**
-	 * The Log service.
-	 *
-	 * @since 3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * Constructor. Recevies.... TODO write docs
-	 */
-	public function __construct( $args ) {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
-
-		if ( empty( $args ) ) {
-			return;
-		}
-
-		// Save a copy of the custom field's params
-		$this->raw_custom_field = reset( $args );
-
-		// Extract meta name (post_meta key for the DB)
-		$this->meta_name = key( $args );
-
-		// Extract linked data predicate
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
-			$this->predicate = $this->raw_custom_field['predicate'];
-		} else {
-			return;
-		}
-
-		// Extract human readable label
-		$exploded_predicate = explode( '/', $this->predicate );
-		$this->label        = end( $exploded_predicate );
-
-		// Extract field constraints (numerosity, expected type)
-		// Default constaints: accept one string.
-		if ( isset( $this->raw_custom_field['type'] ) ) {
-			$this->expected_wl_type = $this->raw_custom_field['type'];
-		} else {
-			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
-		}
-
-		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
-
-			$constraints = $this->raw_custom_field['constraints'];
-
-			// Extract cardinality
-			if ( isset( $constraints['cardinality'] ) ) {
-				$this->cardinality = $constraints['cardinality'];
-			}
-
-			// Which type of entity can we accept (e.g. Place, Event, ecc.)?
-			if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
-			}
-
-		}
-	}
-
-	/**
-	 * Return nonce HTML.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_nonce() {
-
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
-	}
-
-	/**
-	 * Verify nonce.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return boolean Nonce verification
-	 */
-	public function verify_nonce() {
-
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
-
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
-			return false;
-		}
-
-		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
-	}
-
-	/**
-	 * Load data from DB and store the resulting array in $this->data.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function get_data() {
-
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
-
-		// Values are always contained in an array (makes it easier to manage cardinality)
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
-		}
-
-		$this->data = $data;
-	}
-
-	/**
-	 * Sanitizes data before saving to DB. Default sanitization trashes empty values.
-	 * Stores the sanitized values into $this->data so they can be later processed.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @param array $values Array of values to be sanitized and then stored into $this->data
-	 *
-	 */
-	public function sanitize_data( $values ) {
-
-		$sanitized_data = array();
-
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
-		}
-
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
-				$sanitized_data[] = $sanitized_value;
-			}
-		}
-
-		$this->data = $sanitized_data;
-	}
-
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 *
-	 * @return mixed Returns sanitized value, or null.
-	 */
-	public function sanitize_data_filter( $value ) {
-
-		if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/
-			return $value;
-		}
-
-		return null;
-	}
-
-	/**
-	 * Save data to DB.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function save_data( $values ) {
-
-		// Will sanitize data and store them in $field->data
-		$this->sanitize_data( $values );
-
-		$entity_id = get_the_ID();
-
-		// Take away old values
-		delete_post_meta( $entity_id, $this->meta_name );
-
-		// insert new values, respecting cardinality
-		$single = ( $this->cardinality == 1 );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
-		}
-	}
-
-	/**
-	 * Returns the HTML tag that will contain the Field. By default the we return a <div> with data- attributes on cardinality and expected types.
-	 * It is useful to provide data- attributes for the JS scripts.
-	 * Overwrite this method in a child class to obtain custom behaviour.
-	 */
-	public function html_wrapper_open() {
-
-		return '<div class="wl-metabox" data-cardinality="' . $this->cardinality . '">';
-	}
-
-	/**
-	 * Returns Field HTML (nonce included).
-	 * Overwrite this method (or methods called from this method) in a child class to obtain custom behaviour.
-	 */
-	public function html() {
-
-		// Open main <div> for the Field
-		$html = $this->html_wrapper_open();
-
-		// Label
-		$html .= '<h3>' . $this->label . '</h3>';
-
-		// print nonce
-		$html .= $this->html_nonce();
-
-		// print data loaded from DB
-		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
-				}
-				$count ++;
-			}
-		}
-
-		// Print the empty <input> to add new values
-		if ( $count === 0 || $count < $this->cardinality ) {
-			$html .= $this->html_input( '' );    // Will print an empty <input>
-			$count ++;
-		}
-
-		// If cardiality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
-			$html .= '<button class="button wl-add-input" type="button">Add</button>';
-		}
-
-		// Close the HTML wrapper
-		$html .= $this->html_wrapper_close();
-
-		return $html;
-	}
-
-	/**
-	 * Return a single <input> tag for the Field.
-	 *
-	 * @param mixed $value Input value
-	 */
-	public function html_input( $value ) {
-		$html = '<div class="wl-input-wrapper">
+    public $meta_name;
+    public $raw_custom_field;
+    public $predicate;
+    public $label;
+    public $expected_wl_type;
+    public $expected_uri_type;
+    public $cardinality;
+    public $data;
+
+    /**
+     * The Log service.
+     *
+     * @since 3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * Constructor. Recevies.... TODO write docs
+     */
+    public function __construct( $args ) {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+
+        if ( empty( $args ) ) {
+            return;
+        }
+
+        // Save a copy of the custom field's params
+        $this->raw_custom_field = reset( $args );
+
+        // Extract meta name (post_meta key for the DB)
+        $this->meta_name = key( $args );
+
+        // Extract linked data predicate
+        if ( isset( $this->raw_custom_field['predicate'] ) ) {
+            $this->predicate = $this->raw_custom_field['predicate'];
+        } else {
+            return;
+        }
+
+        // Extract human readable label
+        $exploded_predicate = explode( '/', $this->predicate );
+        $this->label        = end( $exploded_predicate );
+
+        // Extract field constraints (numerosity, expected type)
+        // Default constaints: accept one string.
+        if ( isset( $this->raw_custom_field['type'] ) ) {
+            $this->expected_wl_type = $this->raw_custom_field['type'];
+        } else {
+            $this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
+        }
+
+        $this->cardinality = 1;
+        if ( isset( $this->raw_custom_field['constraints'] ) ) {
+
+            $constraints = $this->raw_custom_field['constraints'];
+
+            // Extract cardinality
+            if ( isset( $constraints['cardinality'] ) ) {
+                $this->cardinality = $constraints['cardinality'];
+            }
+
+            // Which type of entity can we accept (e.g. Place, Event, ecc.)?
+            if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
+                $this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
+            }
+
+        }
+    }
+
+    /**
+     * Return nonce HTML.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_nonce() {
+
+        return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+    }
+
+    /**
+     * Verify nonce.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return boolean Nonce verification
+     */
+    public function verify_nonce() {
+
+        $nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
+        $nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+
+        if ( ! isset( $_POST[ $nonce_name ] ) ) {
+            return false;
+        }
+
+        // Verify that the nonce is valid.
+        return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+    }
+
+    /**
+     * Load data from DB and store the resulting array in $this->data.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function get_data() {
+
+        $data = get_post_meta( get_the_ID(), $this->meta_name );
+
+        // Values are always contained in an array (makes it easier to manage cardinality)
+        if ( ! is_array( $data ) ) {
+            $data = array( $data );
+        }
+
+        $this->data = $data;
+    }
+
+    /**
+     * Sanitizes data before saving to DB. Default sanitization trashes empty values.
+     * Stores the sanitized values into $this->data so they can be later processed.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @param array $values Array of values to be sanitized and then stored into $this->data
+     *
+     */
+    public function sanitize_data( $values ) {
+
+        $sanitized_data = array();
+
+        if ( ! is_array( $values ) ) {
+            $values = array( $values );
+        }
+
+        foreach ( $values as $value ) {
+            $sanitized_value = $this->sanitize_data_filter( $value );
+            if ( ! is_null( $sanitized_value ) ) {
+                $sanitized_data[] = $sanitized_value;
+            }
+        }
+
+        $this->data = $sanitized_data;
+    }
+
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     *
+     * @return mixed Returns sanitized value, or null.
+     */
+    public function sanitize_data_filter( $value ) {
+
+        if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/
+            return $value;
+        }
+
+        return null;
+    }
+
+    /**
+     * Save data to DB.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function save_data( $values ) {
+
+        // Will sanitize data and store them in $field->data
+        $this->sanitize_data( $values );
+
+        $entity_id = get_the_ID();
+
+        // Take away old values
+        delete_post_meta( $entity_id, $this->meta_name );
+
+        // insert new values, respecting cardinality
+        $single = ( $this->cardinality == 1 );
+        foreach ( $this->data as $value ) {
+            add_post_meta( $entity_id, $this->meta_name, $value, $single );
+        }
+    }
+
+    /**
+     * Returns the HTML tag that will contain the Field. By default the we return a <div> with data- attributes on cardinality and expected types.
+     * It is useful to provide data- attributes for the JS scripts.
+     * Overwrite this method in a child class to obtain custom behaviour.
+     */
+    public function html_wrapper_open() {
+
+        return '<div class="wl-metabox" data-cardinality="' . $this->cardinality . '">';
+    }
+
+    /**
+     * Returns Field HTML (nonce included).
+     * Overwrite this method (or methods called from this method) in a child class to obtain custom behaviour.
+     */
+    public function html() {
+
+        // Open main <div> for the Field
+        $html = $this->html_wrapper_open();
+
+        // Label
+        $html .= '<h3>' . $this->label . '</h3>';
+
+        // print nonce
+        $html .= $this->html_nonce();
+
+        // print data loaded from DB
+        $count = 0;
+        if ( $this->data ) {
+            foreach ( $this->data as $value ) {
+                if ( $count < $this->cardinality ) {
+                    $html .= $this->html_input( $value );
+                }
+                $count ++;
+            }
+        }
+
+        // Print the empty <input> to add new values
+        if ( $count === 0 || $count < $this->cardinality ) {
+            $html .= $this->html_input( '' );    // Will print an empty <input>
+            $count ++;
+        }
+
+        // If cardiality allows it, print button to add new values.
+        if ( $count < $this->cardinality ) {
+            $html .= '<button class="button wl-add-input" type="button">Add</button>';
+        }
+
+        // Close the HTML wrapper
+        $html .= $this->html_wrapper_close();
+
+        return $html;
+    }
+
+    /**
+     * Return a single <input> tag for the Field.
+     *
+     * @param mixed $value Input value
+     */
+    public function html_input( $value ) {
+        $html = '<div class="wl-input-wrapper">
             <input type="text" id="' . $this->meta_name . '" name="wl_metaboxes[' . $this->meta_name . '][]" value="' . $value . '" style="width:88%" />
             <button class="button wl-remove-input" type="button" style="width:10 % ">Remove</button>
         </div>';
 
-		return $html;
-	}
+        return $html;
+    }
 
-	/**
-	 * Returns closing for the wrapper HTML tag.
-	 */
-	public function html_wrapper_close() {
+    /**
+     * Returns closing for the wrapper HTML tag.
+     */
+    public function html_wrapper_close() {
 
-		return '</div><hr>';
-	}
+        return '</div><hr>';
+    }
 }
 

Spacing +48 added lines, -48 removed lines

@@ -28,52 +28,52 @@ 
 	/**
 	 * Constructor. Recevies.... TODO write docs
 	 */
-	public function __construct( $args ) {
+	public function __construct($args) {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'WL_Metabox_Field' );
+		$this->log_service = Wordlift_Log_Service::get_logger('WL_Metabox_Field');
 
-		if ( empty( $args ) ) {
+		if (empty($args)) {
 			return;
 		}
 
 		// Save a copy of the custom field's params
-		$this->raw_custom_field = reset( $args );
+		$this->raw_custom_field = reset($args);
 
 		// Extract meta name (post_meta key for the DB)
-		$this->meta_name = key( $args );
+		$this->meta_name = key($args);
 
 		// Extract linked data predicate
-		if ( isset( $this->raw_custom_field['predicate'] ) ) {
+		if (isset($this->raw_custom_field['predicate'])) {
 			$this->predicate = $this->raw_custom_field['predicate'];
 		} else {
 			return;
 		}
 
 		// Extract human readable label
-		$exploded_predicate = explode( '/', $this->predicate );
-		$this->label        = end( $exploded_predicate );
+		$exploded_predicate = explode('/', $this->predicate);
+		$this->label        = end($exploded_predicate);
 
 		// Extract field constraints (numerosity, expected type)
 		// Default constaints: accept one string.
-		if ( isset( $this->raw_custom_field['type'] ) ) {
+		if (isset($this->raw_custom_field['type'])) {
 			$this->expected_wl_type = $this->raw_custom_field['type'];
 		} else {
 			$this->expected_wl_type = Wordlift_Schema_Service::DATA_TYPE_STRING;
 		}
 
 		$this->cardinality = 1;
-		if ( isset( $this->raw_custom_field['constraints'] ) ) {
+		if (isset($this->raw_custom_field['constraints'])) {
 
 			$constraints = $this->raw_custom_field['constraints'];
 
 			// Extract cardinality
-			if ( isset( $constraints['cardinality'] ) ) {
+			if (isset($constraints['cardinality'])) {
 				$this->cardinality = $constraints['cardinality'];
 			}
 
 			// Which type of entity can we accept (e.g. Place, Event, ecc.)?
-			if ( $this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset( $constraints['uri_type'] ) ) {
-				$this->expected_uri_type = is_array( $constraints['uri_type'] ) ? $constraints['uri_type'] : array( $constraints['uri_type'] );
+			if ($this->expected_wl_type === Wordlift_Schema_Service::DATA_TYPE_URI && isset($constraints['uri_type'])) {
+				$this->expected_uri_type = is_array($constraints['uri_type']) ? $constraints['uri_type'] : array($constraints['uri_type']);
 			}
 
 		}
@@ -85,7 +85,7 @@ 
 	 */
 	public function html_nonce() {
 
-		return wp_nonce_field( 'wordlift_' . $this->meta_name . '_entity_box', 'wordlift_' . $this->meta_name . '_entity_box_nonce', true, false );
+		return wp_nonce_field('wordlift_'.$this->meta_name.'_entity_box', 'wordlift_'.$this->meta_name.'_entity_box_nonce', true, false);
 	}
 
 	/**
@@ -96,15 +96,15 @@ 
 	 */
 	public function verify_nonce() {
 
-		$nonce_name   = 'wordlift_' . $this->meta_name . '_entity_box_nonce';
-		$nonce_verify = 'wordlift_' . $this->meta_name . '_entity_box';
+		$nonce_name   = 'wordlift_'.$this->meta_name.'_entity_box_nonce';
+		$nonce_verify = 'wordlift_'.$this->meta_name.'_entity_box';
 
-		if ( ! isset( $_POST[ $nonce_name ] ) ) {
+		if ( ! isset($_POST[$nonce_name])) {
 			return false;
 		}
 
 		// Verify that the nonce is valid.
-		return wp_verify_nonce( $_POST[ $nonce_name ], $nonce_verify );
+		return wp_verify_nonce($_POST[$nonce_name], $nonce_verify);
 	}
 
 	/**
@@ -113,11 +113,11 @@ 
 	 */
 	public function get_data() {
 
-		$data = get_post_meta( get_the_ID(), $this->meta_name );
+		$data = get_post_meta(get_the_ID(), $this->meta_name);
 
 		// Values are always contained in an array (makes it easier to manage cardinality)
-		if ( ! is_array( $data ) ) {
-			$data = array( $data );
+		if ( ! is_array($data)) {
+			$data = array($data);
 		}
 
 		$this->data = $data;
@@ -131,17 +131,17 @@ 
 	 * @param array $values Array of values to be sanitized and then stored into $this->data
 	 *
 	 */
-	public function sanitize_data( $values ) {
+	public function sanitize_data($values) {
 
 		$sanitized_data = array();
 
-		if ( ! is_array( $values ) ) {
-			$values = array( $values );
+		if ( ! is_array($values)) {
+			$values = array($values);
 		}
 
-		foreach ( $values as $value ) {
-			$sanitized_value = $this->sanitize_data_filter( $value );
-			if ( ! is_null( $sanitized_value ) ) {
+		foreach ($values as $value) {
+			$sanitized_value = $this->sanitize_data_filter($value);
+			if ( ! is_null($sanitized_value)) {
 				$sanitized_data[] = $sanitized_value;
 			}
 		}
@@ -155,9 +155,9 @@ 
 	 *
 	 * @return mixed Returns sanitized value, or null.
 	 */
-	public function sanitize_data_filter( $value ) {
+	public function sanitize_data_filter($value) {
 
-		if ( ! is_null( $value ) && $value !== '' ) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/
+		if ( ! is_null($value) && $value !== '') {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/
 			return $value;
 		}
 
@@ -168,20 +168,20 @@ 
 	 * Save data to DB.
 	 * Overwrite this method in a child class to obtain custom behaviour.
 	 */
-	public function save_data( $values ) {
+	public function save_data($values) {
 
 		// Will sanitize data and store them in $field->data
-		$this->sanitize_data( $values );
+		$this->sanitize_data($values);
 
 		$entity_id = get_the_ID();
 
 		// Take away old values
-		delete_post_meta( $entity_id, $this->meta_name );
+		delete_post_meta($entity_id, $this->meta_name);
 
 		// insert new values, respecting cardinality
-		$single = ( $this->cardinality == 1 );
-		foreach ( $this->data as $value ) {
-			add_post_meta( $entity_id, $this->meta_name, $value, $single );
+		$single = ($this->cardinality == 1);
+		foreach ($this->data as $value) {
+			add_post_meta($entity_id, $this->meta_name, $value, $single);
 		}
 	}
 
@@ -192,7 +192,7 @@ 
 	 */
 	public function html_wrapper_open() {
 
-		return '<div class="wl-metabox" data-cardinality="' . $this->cardinality . '">';
+		return '<div class="wl-metabox" data-cardinality="'.$this->cardinality.'">';
 	}
 
 	/**
@@ -205,30 +205,30 @@ 
 		$html = $this->html_wrapper_open();
 
 		// Label
-		$html .= '<h3>' . $this->label . '</h3>';
+		$html .= '<h3>'.$this->label.'</h3>';
 
 		// print nonce
 		$html .= $this->html_nonce();
 
 		// print data loaded from DB
 		$count = 0;
-		if ( $this->data ) {
-			foreach ( $this->data as $value ) {
-				if ( $count < $this->cardinality ) {
-					$html .= $this->html_input( $value );
+		if ($this->data) {
+			foreach ($this->data as $value) {
+				if ($count < $this->cardinality) {
+					$html .= $this->html_input($value);
 				}
-				$count ++;
+				$count++;
 			}
 		}
 
 		// Print the empty <input> to add new values
-		if ( $count === 0 || $count < $this->cardinality ) {
-			$html .= $this->html_input( '' );    // Will print an empty <input>
-			$count ++;
+		if ($count === 0 || $count < $this->cardinality) {
+			$html .= $this->html_input(''); // Will print an empty <input>
+			$count++;
 		}
 
 		// If cardiality allows it, print button to add new values.
-		if ( $count < $this->cardinality ) {
+		if ($count < $this->cardinality) {
 			$html .= '<button class="button wl-add-input" type="button">Add</button>';
 		}
 
@@ -243,9 +243,9 @@ 
 	 *
 	 * @param mixed $value Input value
 	 */
-	public function html_input( $value ) {
+	public function html_input($value) {
 		$html = '<div class="wl-input-wrapper">
-            <input type="text" id="' . $this->meta_name . '" name="wl_metaboxes[' . $this->meta_name . '][]" value="' . $value . '" style="width:88%" />
+            <input type="text" id="' . $this->meta_name.'" name="wl_metaboxes['.$this->meta_name.'][]" value="'.$value.'" style="width:88%" />
             <button class="button wl-remove-input" type="button" style="width:10 % ">Remove</button>
         </div>';