insideout10 / wordlift-plugin

src/admin/WL_Metabox/class-wl-metabox.php

Indentation +258 added lines, -258 removed lines

@@ -25,297 +25,297 @@
  */
 class WL_Metabox {
 
-	/**
-	 * The metabox custom fields for the current {@link WP_Post}.
-	 *
-	 * @since  3.1.0
-	 * @access public
-	 * @var array $fields The metabox custom fields.
-	 */
-	public $fields;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		// Add hooks to print metaboxes and save submitted data.
-		add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
-		add_action( 'wl_linked_data_save_post', array(
-			&$this,
-			'save_form_data',
-		) );
-
-		// Enqueue js and css.
-		$this->enqueue_scripts_and_styles();
-
-	}
-
-	/**
-	 * Add a callback to print the metabox in page.
-	 * Wordpress will fire the $this->html() callback at the right time.
-	 */
-	public function add_main_metabox() {
-
-		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-		add_meta_box( $id, $title, array(
-			$this,
-			'html',
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
-
-		// Add filter to change the metabox CSS class.
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
-	}
-
-	/**
-	 * Called from WP to print the metabox content in page.
-	 *
-	 * @since 3.1.0
-	 *
-	 * @param WP_Post $post The post.
-	 */
-	public function html( $post ) {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( $post->ID );
-
-		// Loop over the fields.
-		foreach ( $this->fields as $field ) {
-
-			// 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 );
-
-			}
+    /**
+     * The metabox custom fields for the current {@link WP_Post}.
+     *
+     * @since  3.1.0
+     * @access public
+     * @var array $fields The metabox custom fields.
+     */
+    public $fields;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        // Add hooks to print metaboxes and save submitted data.
+        add_action( 'add_meta_boxes', array( &$this, 'add_main_metabox' ) );
+        add_action( 'wl_linked_data_save_post', array(
+            &$this,
+            'save_form_data',
+        ) );
+
+        // Enqueue js and css.
+        $this->enqueue_scripts_and_styles();
+
+    }
+
+    /**
+     * Add a callback to print the metabox in page.
+     * Wordpress will fire the $this->html() callback at the right time.
+     */
+    public function add_main_metabox() {
+
+        // Add main metabox (will print also the inner fields).
+        $id    = uniqid( 'wl-metabox-' );
+        $title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+        add_meta_box( $id, $title, array(
+            $this,
+            'html',
+        ), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+
+        // Add filter to change the metabox CSS class.
+        add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+    }
+
+    /**
+     * Called from WP to print the metabox content in page.
+     *
+     * @since 3.1.0
+     *
+     * @param WP_Post $post The post.
+     */
+    public function html( $post ) {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( $post->ID );
+
+        // Loop over the fields.
+        foreach ( $this->fields as $field ) {
+
+            // 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 ) {
+            // Loop over grouped properties.
+            foreach ( $grouped_metaboxes as $key => $property ) {
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $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 );
+                // Build the requested field group as WL_Metabox_Field_ object.
+                $this->add_field( $info, true );
 
-			}
+            }
 
-		}
-
-	}
-
-	/**
-	 * Separates metaboxes in simple and grouped.
-	 *
-	 * @param array $custom_fields Information on the entity type.
-	 *
-	 * @return array
-	 */
-	public function group_properties_by_input_field( $custom_fields ) {
+        }
+
+    }
+
+    /**
+     * Separates metaboxes in simple and grouped.
+     *
+     * @param array $custom_fields Information on the entity type.
+     *
+     * @return array
+     */
+    public function group_properties_by_input_field( $custom_fields ) {
 
-		$simple_properties  = array();
-		$grouped_properties = array();
+        $simple_properties  = array();
+        $grouped_properties = array();
 
-		// Loop over possible entity properties.
-		foreach ( $custom_fields as $key => $property ) {
+        // 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 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'] ) {
+                // Check if input_field is defined.
+                if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
 
-					$grouped_key = $property['input_field'];
+                    $grouped_key = $property['input_field'];
 
-					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
+                    // Update list of grouped properties.
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
 
-				} else {
+                } else {
 
-					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
+                    // input_field not defined, add simple metabox.
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
 
-		return array( $simple_properties, $grouped_properties );
-	}
+        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 array $args    The field's information.
-	 * @param bool  $grouped Flag to distinguish between simple and grouped fields.
-	 */
-	public function add_field( $args, $grouped = false ) {
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param array $args    The field's information.
+     * @param bool  $grouped Flag to distinguish between simple and grouped fields.
+     */
+    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 );
+            // 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 {
+        } else {
 
-			// Simple fields (string, uri, boolean, etc.).
-			//
-			// Which field? We want to use the class that is specific for the field.
-			$meta      = key( $args );
-			$this_meta = $args[ $meta ];
+            // Simple fields (string, uri, boolean, etc.).
+            //
+            // Which field? We want to use the class that is specific for the field.
+            $meta      = key( $args );
+            $this_meta = $args[ $meta ];
 
-			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+            // If the field declares what metabox it wants, use that one.
+            if ( isset( $this_meta['metabox']['class'] ) ) {
 
-				$field_class = $this_meta['metabox']['class'];
+                $field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
+            } elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
-				//
-				// Use default WL_Metabox_Field (manages strings).
-				$field_class = 'WL_Metabox_Field';
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
+                //
+                // Use default WL_Metabox_Field (manages strings).
+                $field_class = 'WL_Metabox_Field';
 
-			} else {
+            } else {
 
-				// TODO: all fields should explicitly declare the required WL_Metabox.
-				// When they will remove this.
-				//
-				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+                // TODO: all fields should explicitly declare the required WL_Metabox.
+                // When they will remove this.
+                //
+                // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+                $field_class = 'WL_Metabox_Field_' . $this_meta['type'];
 
-			}
+            }
 
-		}
-		// End if().
+        }
+        // End if().
 
-		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
-	}
+        // Call apropriate constructor (e.g. WL_Metabox_Field_... ).
+        $this->fields[] = new $field_class( $args );
+    }
 
-	/**
-	 * Save the form data for the specified entity {@link WP_Post}'s id.
-	 *
-	 * @since 3.5.4
-	 *
-	 * @param int $entity_id The entity's {@link WP_Post}'s id.
-	 */
-	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;
-		}
+    /**
+     * Save the form data for the specified entity {@link WP_Post}'s id.
+     *
+     * @since 3.5.4
+     *
+     * @param int $entity_id The entity's {@link WP_Post}'s id.
+     */
+    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;
+        }
 
-		foreach ( $this->fields as $field ) {
+        foreach ( $this->fields as $field ) {
 
-			// Verify nonce.
-			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
 
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
 
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
-
-					$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 );
-	}
-
-	/**
-	 * Enqueue scripts and styles.
-	 *
-	 * @since 3.0.0
-	 */
-	public function enqueue_scripts_and_styles() {
-
-		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
+                // 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 );
+    }
+
+    /**
+     * Enqueue scripts and styles.
+     *
+     * @since 3.0.0
+     */
+    public function enqueue_scripts_and_styles() {
+
+        // Load the jquery-ui-timepicker-addon library.
+        wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
+        wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
 
-		wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
-			'jquery-ui-datepicker',
-			'jquery-ui-timepicker-addon',
-		) );
-
-		// 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',
-			)
-		);
-
-	}
+        wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
+            'jquery-ui-datepicker',
+            'jquery-ui-timepicker-addon',
+        ) );
+
+        // 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 +66 added lines, -66 removed lines

@@ -7,14 +7,14 @@ 
  * @subpackage Wordlift/admin/WL_Metabox
  */
 
-require_once( 'WL_Metabox_Field.php' );
-require_once( 'WL_Metabox_Field_date.php' );
-require_once( 'WL_Metabox_Field_uri.php' );
-require_once( 'WL_Metabox_Field_coordinates.php' );
-require_once( 'WL_Metabox_Field_sameas.php' );
-require_once( 'WL_Metabox_Field_address.php' );
-require_once( 'class-wordlift-metabox-field-duration.php' );
-require_once( 'class-wordlift-metabox-field-multiline.php' );
+require_once('WL_Metabox_Field.php');
+require_once('WL_Metabox_Field_date.php');
+require_once('WL_Metabox_Field_uri.php');
+require_once('WL_Metabox_Field_coordinates.php');
+require_once('WL_Metabox_Field_sameas.php');
+require_once('WL_Metabox_Field_address.php');
+require_once('class-wordlift-metabox-field-duration.php');
+require_once('class-wordlift-metabox-field-multiline.php');
 
 /**
  * Define the {@link WL_Metabox} class.
@@ -42,11 +42,11 @@ 
 	public function __construct() {
 
 		// 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(
+		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();
@@ -60,15 +60,15 @@ 
 	public function add_main_metabox() {
 
 		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-		add_meta_box( $id, $title, array(
+		$id    = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
+		add_meta_box($id, $title, array(
 			$this,
 			'html',
-		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high' );
+		), Wordlift_Entity_Service::TYPE_NAME, 'normal', 'high');
 
 		// Add filter to change the metabox CSS class.
-		add_filter( "postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class' );
+		add_filter("postbox_classes_entity_$id", 'wl_admin_metaboxes_add_css_class');
 	}
 
 	/**
@@ -78,13 +78,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();
@@ -105,16 +105,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.
@@ -122,31 +122,31 @@ 
 			 * - 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);
 
 			}
 
@@ -161,34 +161,34 @@ 
 	 *
 	 * @return array
 	 */
-	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);
 	}
 
 	/**
@@ -198,29 +198,29 @@ 
 	 * @param array $args    The field's information.
 	 * @param bool  $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 );
-			$this_meta = $args[ $meta ];
+			$meta      = key($args);
+			$this_meta = $args[$meta];
 
 			// If the field declares what metabox it wants, use that one.
-			if ( isset( $this_meta['metabox']['class'] ) ) {
+			if (isset($this_meta['metabox']['class'])) {
 
 				$field_class = $this_meta['metabox']['class'];
 
-			} elseif ( ! isset( $this_meta['type'] ) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type'] ) {
+			} elseif ( ! isset($this_meta['type']) || Wordlift_Schema_Service::DATA_TYPE_STRING === $this_meta['type']) {
 
 				// TODO: all fields should explicitly declare the required WL_Metabox.
 				// When they will remove this.
@@ -234,7 +234,7 @@ 
 				// When they will remove this.
 				//
 				// Build Field with a custom class (e.g. WL_Metabox_Field_date).
-				$field_class = 'WL_Metabox_Field_' . $this_meta['type'];
+				$field_class = 'WL_Metabox_Field_'.$this_meta['type'];
 
 			}
 
@@ -242,7 +242,7 @@ 
 		// End if().
 
 		// Call apropriate constructor (e.g. WL_Metabox_Field_... ).
-		$this->fields[] = new $field_class( $args );
+		$this->fields[] = new $field_class($args);
 	}
 
 	/**
@@ -252,40 +252,40 @@ 
 	 *
 	 * @param int $entity_id The entity's {@link WP_Post}'s id.
 	 */
-	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);
 	}
 
 	/**
@@ -296,22 +296,22 @@ 
 	public function enqueue_scripts_and_styles() {
 
 		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css' );
-		wp_enqueue_script( 'jquery-ui-timepicker-addon', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array( 'jquery-ui-datepicker' ), '1.6.3', true );
+		wp_enqueue_style('jquery-ui-timepicker-addon', dirname(plugin_dir_url(__FILE__)).'/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.css');
+		wp_enqueue_script('jquery-ui-timepicker-addon', dirname(plugin_dir_url(__FILE__)).'/js/jquery-ui-timepicker-addon/jquery-ui-timepicker-addon.min.js', array('jquery-ui-datepicker'), '1.6.3', true);
 
-		wp_enqueue_script( 'jquery-ui-timepicker-no-conflict', dirname( plugin_dir_url( __FILE__ ) ) . '/js/jquery.datetimepicker.no-conflict.js', array(
+		wp_enqueue_script('jquery-ui-timepicker-no-conflict', dirname(plugin_dir_url(__FILE__)).'/js/jquery.datetimepicker.no-conflict.js', array(
 			'jquery-ui-datepicker',
 			'jquery-ui-timepicker-addon',
-		) );
+		));
 
 		// 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/wordlift_admin_meta_box_entities.php

Indentation +94 added lines, -94 removed lines

@@ -10,15 +10,15 @@ 
  */
 function wl_register_metaboxes() {
 
-	// Load metabox classes
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+    // Load metabox classes
+    require_once( 'WL_Metabox/class-wl-metabox.php' );
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing
+    $wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing
 }
 
 if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+    add_action( 'load-post.php', 'wl_register_metaboxes' );
+    add_action( 'load-post-new.php', 'wl_register_metaboxes' );
 }
 
 
@@ -29,12 +29,12 @@ 
  */
 function wl_admin_add_entities_meta_box( $post_type ) {
 
-	// wl_write_log( "wl_admin_add_entities_meta_box [ post type :: $post_type ]" );
+    // wl_write_log( "wl_admin_add_entities_meta_box [ post type :: $post_type ]" );
 
-	// Add main meta box for related entities and 4W
-	add_meta_box(
-		'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
-	);
+    // Add main meta box for related entities and 4W
+    add_meta_box(
+        'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+    );
 }
 
 add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
@@ -46,90 +46,90 @@ 
  */
 function wl_entities_box_content( $post ) {
 
-	// wl_write_log( "wl_entities_box_content [ post id :: $post->ID ]" );
-
-	// Angularjs edit-post widget wrapper
-	echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
-
-	// Angularjs edit-post widget classification boxes configuration
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
-
-	// Array to store all related entities ids
-	$all_referenced_entities_ids = array();
-
-	// Add selected entities to classification_boxes
-	foreach ( $classification_boxes as $i => $box ) {
-		// Build the proper relation name
-		$relation_name = $box['id'];
-
-		// wl_write_log( "Going to related of $relation_name" );
-
-		// Get entity ids related to the current post for the given relation name (both draft and published entities)
-		$draft_entity_ids   = wl_core_get_related_entity_ids( $post->ID, array(
-			'predicate' => $relation_name,
-			'status'    => 'draft',
-		) );
-		$publish_entity_ids = wl_core_get_related_entity_ids( $post->ID, array(
-			'predicate' => $relation_name,
-			'status'    => 'publish',
-		) );
-		$entity_ids         = array_unique( array_merge( $draft_entity_ids, $publish_entity_ids ) );
-
-		// Store the entity ids for all the 4W
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
-
-		// Transform entity ids array in entity uris array
-		array_walk( $entity_ids, function ( &$entity_id ) {
-			// Retrieve the entity uri for the given entity id
-			$entity_id = wl_get_entity_uri( $entity_id );
-		} );
-
-		// Enhance current box selected entities
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_ids;
-	}
-	// Json encoding for classification boxes structure
-	$classification_boxes = json_encode( $classification_boxes );
-
-	// Ensure there are no repetitions of the referenced entities
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
-
-	// Build the entity storage object
-	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity                                   = wl_serialize_entity( $referenced_entity );
-		$referenced_entities_obj[ $entity['id'] ] = $entity;
-	}
-
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : json_encode( $referenced_entities_obj );
-
-	$published_place_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
-	);
-	$published_place_obj = ( $published_place_id ) ?
-		json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
-
-	$topic_id  = get_post_meta(
-		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
-	);
-	$topic_obj = ( $topic_id ) ?
-		json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
-
-	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
-	$default_path           = WL_DEFAULT_PATH;
-	$dataset_uri            = wl_configuration_get_redlink_dataset_uri();
-	$current_post_uri       = wl_get_entity_uri( $post->ID );
-
-	// Retrieve the current post author
-	$post_author = get_userdata( $post->post_author )->display_name;
-	// Retrive the published date
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
-	// Current language
-	$current_language = wl_configuration_get_site_language();
-
-	echo <<<EOF
+    // wl_write_log( "wl_entities_box_content [ post id :: $post->ID ]" );
+
+    // Angularjs edit-post widget wrapper
+    echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
+
+    // Angularjs edit-post widget classification boxes configuration
+    $classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+
+    // Array to store all related entities ids
+    $all_referenced_entities_ids = array();
+
+    // Add selected entities to classification_boxes
+    foreach ( $classification_boxes as $i => $box ) {
+        // Build the proper relation name
+        $relation_name = $box['id'];
+
+        // wl_write_log( "Going to related of $relation_name" );
+
+        // Get entity ids related to the current post for the given relation name (both draft and published entities)
+        $draft_entity_ids   = wl_core_get_related_entity_ids( $post->ID, array(
+            'predicate' => $relation_name,
+            'status'    => 'draft',
+        ) );
+        $publish_entity_ids = wl_core_get_related_entity_ids( $post->ID, array(
+            'predicate' => $relation_name,
+            'status'    => 'publish',
+        ) );
+        $entity_ids         = array_unique( array_merge( $draft_entity_ids, $publish_entity_ids ) );
+
+        // Store the entity ids for all the 4W
+        $all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+
+        // Transform entity ids array in entity uris array
+        array_walk( $entity_ids, function ( &$entity_id ) {
+            // Retrieve the entity uri for the given entity id
+            $entity_id = wl_get_entity_uri( $entity_id );
+        } );
+
+        // Enhance current box selected entities
+        $classification_boxes[ $i ]['selectedEntities'] = $entity_ids;
+    }
+    // Json encoding for classification boxes structure
+    $classification_boxes = json_encode( $classification_boxes );
+
+    // Ensure there are no repetitions of the referenced entities
+    $all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+
+    // Build the entity storage object
+    $referenced_entities_obj = array();
+    foreach ( $all_referenced_entities_ids as $referenced_entity ) {
+        $entity                                   = wl_serialize_entity( $referenced_entity );
+        $referenced_entities_obj[ $entity['id'] ] = $entity;
+    }
+
+    $referenced_entities_obj = empty( $referenced_entities_obj ) ?
+        '{}' : json_encode( $referenced_entities_obj );
+
+    $published_place_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
+    );
+    $published_place_obj = ( $published_place_id ) ?
+        json_encode( wl_serialize_entity( $published_place_id ) ) :
+        'undefined';
+
+    $topic_id  = get_post_meta(
+        $post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
+    );
+    $topic_obj = ( $topic_id ) ?
+        json_encode( wl_serialize_entity( $topic_id ) ) :
+        'undefined';
+
+    $default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
+    $default_path           = WL_DEFAULT_PATH;
+    $dataset_uri            = wl_configuration_get_redlink_dataset_uri();
+    $current_post_uri       = wl_get_entity_uri( $post->ID );
+
+    // Retrieve the current post author
+    $post_author = get_userdata( $post->post_author )->display_name;
+    // Retrive the published date
+    $published_date = get_the_time( 'Y-m-d', $post->ID );
+    // Current language
+    $current_language = wl_configuration_get_site_language();
+
+    echo <<<EOF
     <script type="text/javascript">
         jQuery( function() {
 

Spacing +34 added lines, -36 removed lines

@@ -11,14 +11,14 @@ 
 function wl_register_metaboxes() {
 
 	// Load metabox classes
-	require_once( 'WL_Metabox/class-wl-metabox.php' );
+	require_once('WL_Metabox/class-wl-metabox.php');
 
-	$wl_metabox = new WL_Metabox();     // Everything is done inside here with the correct timing
+	$wl_metabox = new WL_Metabox(); // Everything is done inside here with the correct timing
 }
 
-if ( is_admin() ) {
-	add_action( 'load-post.php', 'wl_register_metaboxes' );
-	add_action( 'load-post-new.php', 'wl_register_metaboxes' );
+if (is_admin()) {
+	add_action('load-post.php', 'wl_register_metaboxes');
+	add_action('load-post-new.php', 'wl_register_metaboxes');
 }
 
 
@@ -27,24 +27,24 @@ 
  *
  * @param string $post_type The type of the current open post.
  */
-function wl_admin_add_entities_meta_box( $post_type ) {
+function wl_admin_add_entities_meta_box($post_type) {
 
 	// wl_write_log( "wl_admin_add_entities_meta_box [ post type :: $post_type ]" );
 
 	// Add main meta box for related entities and 4W
 	add_meta_box(
-		'wordlift_entities_box', __( 'WordLift', 'wordlift' ), 'wl_entities_box_content', $post_type, 'side', 'high'
+		'wordlift_entities_box', __('WordLift', 'wordlift'), 'wl_entities_box_content', $post_type, 'side', 'high'
 	);
 }
 
-add_action( 'add_meta_boxes', 'wl_admin_add_entities_meta_box' );
+add_action('add_meta_boxes', 'wl_admin_add_entities_meta_box');
 
 /**
  * Displays the meta box contents (called by *add_meta_box* callback).
  *
  * @param WP_Post $post The current post.
  */
-function wl_entities_box_content( $post ) {
+function wl_entities_box_content($post) {
 
 	// wl_write_log( "wl_entities_box_content [ post id :: $post->ID ]" );
 
@@ -52,80 +52,78 @@ 
 	echo '<div id="wordlift-edit-post-outer-wrapper"></div>';
 
 	// Angularjs edit-post widget classification boxes configuration
-	$classification_boxes = unserialize( WL_CORE_POST_CLASSIFICATION_BOXES );
+	$classification_boxes = unserialize(WL_CORE_POST_CLASSIFICATION_BOXES);
 
 	// Array to store all related entities ids
 	$all_referenced_entities_ids = array();
 
 	// Add selected entities to classification_boxes
-	foreach ( $classification_boxes as $i => $box ) {
+	foreach ($classification_boxes as $i => $box) {
 		// Build the proper relation name
 		$relation_name = $box['id'];
 
 		// wl_write_log( "Going to related of $relation_name" );
 
 		// Get entity ids related to the current post for the given relation name (both draft and published entities)
-		$draft_entity_ids   = wl_core_get_related_entity_ids( $post->ID, array(
+		$draft_entity_ids = wl_core_get_related_entity_ids($post->ID, array(
 			'predicate' => $relation_name,
 			'status'    => 'draft',
-		) );
-		$publish_entity_ids = wl_core_get_related_entity_ids( $post->ID, array(
+		));
+		$publish_entity_ids = wl_core_get_related_entity_ids($post->ID, array(
 			'predicate' => $relation_name,
 			'status'    => 'publish',
-		) );
-		$entity_ids         = array_unique( array_merge( $draft_entity_ids, $publish_entity_ids ) );
+		));
+		$entity_ids = array_unique(array_merge($draft_entity_ids, $publish_entity_ids));
 
 		// Store the entity ids for all the 4W
-		$all_referenced_entities_ids = array_merge( $all_referenced_entities_ids, $entity_ids );
+		$all_referenced_entities_ids = array_merge($all_referenced_entities_ids, $entity_ids);
 
 		// Transform entity ids array in entity uris array
-		array_walk( $entity_ids, function ( &$entity_id ) {
+		array_walk($entity_ids, function(&$entity_id) {
 			// Retrieve the entity uri for the given entity id
-			$entity_id = wl_get_entity_uri( $entity_id );
+			$entity_id = wl_get_entity_uri($entity_id);
 		} );
 
 		// Enhance current box selected entities
-		$classification_boxes[ $i ]['selectedEntities'] = $entity_ids;
+		$classification_boxes[$i]['selectedEntities'] = $entity_ids;
 	}
 	// Json encoding for classification boxes structure
-	$classification_boxes = json_encode( $classification_boxes );
+	$classification_boxes = json_encode($classification_boxes);
 
 	// Ensure there are no repetitions of the referenced entities
-	$all_referenced_entities_ids = array_unique( $all_referenced_entities_ids );
+	$all_referenced_entities_ids = array_unique($all_referenced_entities_ids);
 
 	// Build the entity storage object
 	$referenced_entities_obj = array();
-	foreach ( $all_referenced_entities_ids as $referenced_entity ) {
-		$entity                                   = wl_serialize_entity( $referenced_entity );
-		$referenced_entities_obj[ $entity['id'] ] = $entity;
+	foreach ($all_referenced_entities_ids as $referenced_entity) {
+		$entity                                   = wl_serialize_entity($referenced_entity);
+		$referenced_entities_obj[$entity['id']] = $entity;
 	}
 
-	$referenced_entities_obj = empty( $referenced_entities_obj ) ?
-		'{}' : json_encode( $referenced_entities_obj );
+	$referenced_entities_obj = empty($referenced_entities_obj) ?
+		'{}' : json_encode($referenced_entities_obj);
 
 	$published_place_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_LOCATION_CREATED, true
 	);
-	$published_place_obj = ( $published_place_id ) ?
-		json_encode( wl_serialize_entity( $published_place_id ) ) :
-		'undefined';
+	$published_place_obj = ($published_place_id) ?
+		json_encode(wl_serialize_entity($published_place_id)) : 'undefined';
 
 	$topic_id  = get_post_meta(
 		$post->ID, Wordlift_Schema_Service::FIELD_TOPIC, true
 	);
-	$topic_obj = ( $topic_id ) ?
-		json_encode( wl_serialize_entity( $topic_id ) ) :
-		'undefined';
+	$topic_obj = ($topic_id) ?
+		json_encode(wl_serialize_entity($topic_id)) : 'undefined';
 
 	$default_thumbnail_path = WL_DEFAULT_THUMBNAIL_PATH;
 	$default_path           = WL_DEFAULT_PATH;
 	$dataset_uri            = wl_configuration_get_redlink_dataset_uri();
-	$current_post_uri       = wl_get_entity_uri( $post->ID );
+	$current_post_uri       = wl_get_entity_uri($post->ID);
 
 	// Retrieve the current post author
-	$post_author = get_userdata( $post->post_author )->display_name;
+	$post_author = get_userdata($post->post_author)->display_name;
 	// Retrive the published date
-	$published_date = get_the_time( 'Y-m-d', $post->ID );
+	$published_date = get_the_time('Y-m-d', $post->ID);
 	// Current language
 	$current_language = wl_configuration_get_site_language();