insideout10 / wordlift-plugin

src/public/class-wordlift-navigator-shortcode.php

Indentation +43 added lines, -43 removed lines

@@ -17,59 +17,59 @@
  */
 class Wordlift_Navigator_Shortcode extends Wordlift_Shortcode {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	const SHORTCODE = 'wl_navigator';
+    /**
+     * {@inheritdoc}
+     */
+    const SHORTCODE = 'wl_navigator';
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function render( $atts ) {
+    /**
+     * {@inheritdoc}
+     */
+    public function render( $atts ) {
 
-		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
-			'with_carousel'  => true,
-			'squared_thumbs' => false,
-		), $atts );
+        // Extract attributes and set default values.
+        $shortcode_atts = shortcode_atts( array(
+            'title'          => __( 'Related articles', 'wordlift' ),
+            'with_carousel'  => true,
+            'squared_thumbs' => false,
+        ), $atts );
 
-		foreach (
-			array(
-				'with_carousel',
-				'squared_thumbs',
-			) as $att
-		) {
+        foreach (
+            array(
+                'with_carousel',
+                'squared_thumbs',
+            ) as $att
+        ) {
 
-			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
-			);
-		}
+            // See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
+            $shortcode_atts[ $att ] = filter_var(
+                $shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+            );
+        }
 
-		// avoid building the widget when there is a list of posts.
-		if ( ! is_single() ) {
-			return '';
-		}
+        // avoid building the widget when there is a list of posts.
+        if ( ! is_single() ) {
+            return '';
+        }
 
-		$current_post = get_post();
+        $current_post = get_post();
 
-		// Enqueue common shortcode scripts.
-		$this->enqueue_scripts();
+        // Enqueue common shortcode scripts.
+        $this->enqueue_scripts();
 
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
 
-		$navigator_id = uniqid( 'wl-navigator-widget-' );
+        $navigator_id = uniqid( 'wl-navigator-widget-' );
 
-		wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
-				'action'   => 'wl_navigator',
-				'post_id'  => $current_post->ID,
-				'attrs'    => $shortcode_atts,
-			)
-		);
+        wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
+                'ajax_url' => admin_url( 'admin-ajax.php' ),
+                'action'   => 'wl_navigator',
+                'post_id'  => $current_post->ID,
+                'attrs'    => $shortcode_atts,
+            )
+        );
 
-		return "<div id='$navigator_id' class='wl-navigator-widget'></div>";
-	}
+        return "<div id='$navigator_id' class='wl-navigator-widget'></div>";
+    }
 
 }

Spacing +11 added lines, -11 removed lines

@@ -25,14 +25,14 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$shortcode_atts = shortcode_atts( array(
-			'title'          => __( 'Related articles', 'wordlift' ),
+		$shortcode_atts = shortcode_atts(array(
+			'title'          => __('Related articles', 'wordlift'),
 			'with_carousel'  => true,
 			'squared_thumbs' => false,
-		), $atts );
+		), $atts);
 
 		foreach (
 			array(
@@ -42,13 +42,13 @@ 
 		) {
 
 			// See http://wordpress.stackexchange.com/questions/119294/pass-boolean-value-in-shortcode
-			$shortcode_atts[ $att ] = filter_var(
-				$shortcode_atts[ $att ], FILTER_VALIDATE_BOOLEAN
+			$shortcode_atts[$att] = filter_var(
+				$shortcode_atts[$att], FILTER_VALIDATE_BOOLEAN
 			);
 		}
 
 		// avoid building the widget when there is a list of posts.
-		if ( ! is_single() ) {
+		if ( ! is_single()) {
 			return '';
 		}
 
@@ -57,12 +57,12 @@ 
 		// Enqueue common shortcode scripts.
 		$this->enqueue_scripts();
 
-		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+		wp_enqueue_style('wordlift-ui', dirname(plugin_dir_url(__FILE__)).'/css/wordlift-ui.min.css');
 
-		$navigator_id = uniqid( 'wl-navigator-widget-' );
+		$navigator_id = uniqid('wl-navigator-widget-');
 
-		wp_localize_script( 'wordlift-ui', 'wl_navigator_params', array(
-				'ajax_url' => admin_url( 'admin-ajax.php' ),
+		wp_localize_script('wordlift-ui', 'wl_navigator_params', array(
+				'ajax_url' => admin_url('admin-ajax.php'),
 				'action'   => 'wl_navigator',
 				'post_id'  => $current_post->ID,
 				'attrs'    => $shortcode_atts,

src/admin/class-wordlift-admin-select2-element.php

Indentation +30 added lines, -30 removed lines

@@ -18,38 +18,38 @@ 
  */
 class Wordlift_Admin_Select2_Element implements Wordlift_Admin_Element {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function render( $args ) {
+    /**
+     * @inheritdoc
+     */
+    public function render( $args ) {
 
-		// Enqueue select2 library js and css.
-		// Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
-		wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
-			'jquery',
-			'underscore',
-		), '4.0.3' );
-		wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
+        // Enqueue select2 library js and css.
+        // Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
+        wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
+            'jquery',
+            'underscore',
+        ), '4.0.3' );
+        wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
 
 
-		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'                 => uniqid( 'wl-input-' ),
-			'name'               => uniqid( 'wl-input-' ),
-			'value'              => null,
-			'options'            => array(),
-			'description'        => false,
-			'data'               => array(),
-			'template-result'    => '<%= text %>',
-			'template-selection' => '<%= text %>',
-		) );
+        // Parse the arguments and merge with default values.
+        $params = wp_parse_args( $args, array(
+            'id'                 => uniqid( 'wl-input-' ),
+            'name'               => uniqid( 'wl-input-' ),
+            'value'              => null,
+            'options'            => array(),
+            'description'        => false,
+            'data'               => array(),
+            'template-result'    => '<%= text %>',
+            'template-selection' => '<%= text %>',
+        ) );
 
-		$description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+        $description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
 
-		// For data attributes we define our own "namespace" `wl-select2-` to avoid
-		// Select2 preloading configuration on its own. In fact we need to support
-		// underscore templates.
-		?>
+        // For data attributes we define our own "namespace" `wl-select2-` to avoid
+        // Select2 preloading configuration on its own. In fact we need to support
+        // underscore templates.
+        ?>
 		<select id="<?php echo esc_attr( $params['id'] ); ?>"
 		        name="<?php echo esc_attr( $params['name'] ); ?>"
 		        class="wl-select2-element"
@@ -59,14 +59,14 @@ 
 			<?php foreach ( $params['options'] as $value => $label ) { ?>
 				<option value="<?php echo esc_attr( $value ); ?>"
 					<?php selected( $params['value'], $value ) ?>><?php
-					echo esc_html( $label ); ?></option>
+                    echo esc_html( $label ); ?></option>
 			<?php } ?>
 		</select>
 		<?php echo $description; ?>
 
 		<?php
 
-		return $this;
-	}
+        return $this;
+    }
 
 }

Spacing +18 added lines, -18 removed lines

@@ -21,45 +21,45 @@
 	/**
 	 * @inheritdoc
 	 */
-	public function render( $args ) {
+	public function render($args) {
 
 		// Enqueue select2 library js and css.
 		// Underscore is needed for Select2's `templateResult` and `templateSelection` templates.
-		wp_enqueue_script( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/js/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.js', array(
+		wp_enqueue_script('wordlift-select2', plugin_dir_url(dirname(__FILE__)).'admin/js/select2/js/select2'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.js', array(
 			'jquery',
 			'underscore',
-		), '4.0.3' );
-		wp_enqueue_style( 'wordlift-select2', plugin_dir_url( dirname( __FILE__ ) ) . 'admin/js/select2/css/select2' . ( ! defined( 'SCRIPT_DEBUG' ) || ! SCRIPT_DEBUG ? '.min' : '' ) . '.css', array(), '4.0.3' );
+		), '4.0.3');
+		wp_enqueue_style('wordlift-select2', plugin_dir_url(dirname(__FILE__)).'admin/js/select2/css/select2'.( ! defined('SCRIPT_DEBUG') || ! SCRIPT_DEBUG ? '.min' : '').'.css', array(), '4.0.3');
 
 
 		// Parse the arguments and merge with default values.
-		$params = wp_parse_args( $args, array(
-			'id'                 => uniqid( 'wl-input-' ),
-			'name'               => uniqid( 'wl-input-' ),
+		$params = wp_parse_args($args, array(
+			'id'                 => uniqid('wl-input-'),
+			'name'               => uniqid('wl-input-'),
 			'value'              => null,
 			'options'            => array(),
 			'description'        => false,
 			'data'               => array(),
 			'template-result'    => '<%= text %>',
 			'template-selection' => '<%= text %>',
-		) );
+		));
 
-		$description = $params['description'] ? '<p>' . wp_kses( $params['description'], array( 'a' => array( 'href' => array() ) ) ) . '</p>' : '';
+		$description = $params['description'] ? '<p>'.wp_kses($params['description'], array('a' => array('href' => array()))).'</p>' : '';
 
 		// For data attributes we define our own "namespace" `wl-select2-` to avoid
 		// Select2 preloading configuration on its own. In fact we need to support
 		// underscore templates.
 		?>
-		<select id="<?php echo esc_attr( $params['id'] ); ?>"
-		        name="<?php echo esc_attr( $params['name'] ); ?>"
+		<select id="<?php echo esc_attr($params['id']); ?>"
+		        name="<?php echo esc_attr($params['name']); ?>"
 		        class="wl-select2-element"
-		        data-wl-select2-data="<?php echo esc_attr( json_encode( $params['data'] ) ); ?>"
-		        data-wl-select2-template-result="<?php echo esc_attr( $params['template-result'] ); ?>"
-		        data-wl-select2-template-selection="<?php echo esc_attr( $params['template-selection'] ); ?>">
-			<?php foreach ( $params['options'] as $value => $label ) { ?>
-				<option value="<?php echo esc_attr( $value ); ?>"
-					<?php selected( $params['value'], $value ) ?>><?php
-					echo esc_html( $label ); ?></option>
+		        data-wl-select2-data="<?php echo esc_attr(json_encode($params['data'])); ?>"
+		        data-wl-select2-template-result="<?php echo esc_attr($params['template-result']); ?>"
+		        data-wl-select2-template-selection="<?php echo esc_attr($params['template-selection']); ?>">
+			<?php foreach ($params['options'] as $value => $label) { ?>
+				<option value="<?php echo esc_attr($value); ?>"
+					<?php selected($params['value'], $value) ?>><?php
+					echo esc_html($label); ?></option>
 			<?php } ?>
 		</select>
 		<?php echo $description; ?>

src/admin/WL_Metabox/class-wordlift-metabox-field-duration.php

Indentation +36 added lines, -36 removed lines

@@ -18,41 +18,41 @@
  */
 class Wordlift_Metabox_Field_Duration extends WL_Metabox_Field_date {
 
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct( $args ) {
-		parent::__construct( $args );
-
-		$this->date_format = 'H:i';
-		$this->timepicker  = true;
-		$this->no_calendar = true;
-
-	}
-
-	/**
-	 * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
-	 * make sure the value is either empty, an integer representing valid number of minutes
-	 * or an HH:MM time format.
-	 *
-	 * @param mixed $value The value being sanitized.
-	 *
-	 * @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/ .
-			preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
-				trim( $value ),
-				$matches
-			);
-
-			if ( count( $matches ) > 0 ) {
-				return $matches[0];
-			}
-		}
-
-		return null;
-	}
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct( $args ) {
+        parent::__construct( $args );
+
+        $this->date_format = 'H:i';
+        $this->timepicker  = true;
+        $this->no_calendar = true;
+
+    }
+
+    /**
+     * Sanitize a single value. Called from $this->sanitize_data. Default sanitization excludes empty values.
+     * make sure the value is either empty, an integer representing valid number of minutes
+     * or an HH:MM time format.
+     *
+     * @param mixed $value The value being sanitized.
+     *
+     * @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/ .
+            preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
+                trim( $value ),
+                $matches
+            );
+
+            if ( count( $matches ) > 0 ) {
+                return $matches[0];
+            }
+        }
+
+        return null;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -21,8 +21,8 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function __construct( $args ) {
-		parent::__construct( $args );
+	public function __construct($args) {
+		parent::__construct($args);
 
 		$this->date_format = 'H:i';
 		$this->timepicker  = true;
@@ -39,15 +39,15 @@ 
 	 *
 	 * @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/ .
-			preg_match( '#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
-				trim( $value ),
+		if ( ! is_null($value) && '' !== $value) {         // do not use 'empty()' -> https://www.virendrachandak.com/techtalk/php-isset-vs-empty-vs-is_null/ .
+			preg_match('#((([01]?[0-9]{1}|2[0-3]{1}):)?[0-5]{1})?[0-9]{1}#',
+				trim($value),
 				$matches
 			);
 
-			if ( count( $matches ) > 0 ) {
+			if (count($matches) > 0) {
 				return $matches[0];
 			}
 		}

src/admin/WL_Metabox/WL_Metabox_Field.php

Indentation +245 added lines, -245 removed lines

@@ -7,258 +7,258 @@
  */
 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;
-
-	/**
-	 * @param array $args
-	 */
-	public function __construct( $args ) {
-
-		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 );
-
-		// Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
-		$this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['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 ) {
-
-		// TODO: all fields should provide their own sanitize which shouldn't be part of a UI class.
-		// If the field provides its own validation, use it.
-		if ( isset( $this->raw_custom_field['sanitize'] ) ) {
-			return call_user_func( $this->raw_custom_field['sanitize'], $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-field' 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 ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
-			$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 wl-button" 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
-	 *
-	 * @return string
-	 */
-	public function html_input( $value ) {
-		$html = <<<EOF
+    public $meta_name;
+    public $raw_custom_field;
+    public $predicate;
+    public $label;
+    public $expected_wl_type;
+    public $expected_uri_type;
+    public $cardinality;
+    public $data;
+
+    /**
+     * @param array $args
+     */
+    public function __construct( $args ) {
+
+        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 );
+
+        // Use the label defined for the property if set, otherwise the last part of the schema.org/xyz predicate.
+        $this->label = isset( $this->raw_custom_field['metabox']['label'] ) ? $this->raw_custom_field['metabox']['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 ) {
+
+        // TODO: all fields should provide their own sanitize which shouldn't be part of a UI class.
+        // If the field provides its own validation, use it.
+        if ( isset( $this->raw_custom_field['sanitize'] ) ) {
+            return call_user_func( $this->raw_custom_field['sanitize'], $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-field' 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 ) { DO NOT print empty inputs unless requested by the editor since fields might support empty strings.
+            $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 wl-button" 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
+     *
+     * @return string
+     */
+    public function html_input( $value ) {
+        $html = <<<EOF
 			<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 wl-button" type="button">Remove</button>
 			</div>
 EOF;
 
-		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>';
+    }
 
 }

src/admin/WL_Metabox/WL_Metabox_Field_date.php

Indentation +70 added lines, -70 removed lines

@@ -18,81 +18,81 @@ 
  */
 class WL_Metabox_Field_date extends WL_Metabox_Field {
 
-	/**
-	 * Attribute to distinguish between date formats, inferred from the schema property export type
-	 *
-	 * @since  3.2.0
-	 * @access protected
-	 * @var string $date_format The date format.
-	 */
-	protected $date_format;
-
-	/**
-	 * Boolean flag to decide if the calendar should include time or not
-	 *
-	 * @since  3.2.0
-	 * @access protected
-	 * @var boolean $timepicker A boolean flag.
-	 */
-	protected $timepicker;
-
-	/**
-	 * Whether the calendar should be displayed or not.
-	 *
-	 * @since  3.14.0
-	 * @access protected
-	 * @var boolean $no_calendar Whether the calendar should be displayed or not.
-	 */
-	protected $no_calendar;
-
-	/**
-	 * {@inheritdoc}
-	 */
-	public function __construct( $args ) {
-		parent::__construct( $args );
-
-		$this->no_calendar = false;
-
-		// Distinguish between date and datetime
-		if ( isset( $this->raw_custom_field['export_type'] ) && 'xsd:datetime' === $this->raw_custom_field['export_type'] ) {
-			$this->date_format = 'Y/m/d H:i';
-			$this->timepicker  = true;
-		} else {
-			$this->date_format = 'Y/m/d';
-			$this->timepicker  = false;
-		}
-
-	}
-
-	/**
-	 * @param mixed $date
-	 *
-	 * @return string
-	 */
-	public function html_input( $date ) {
-
-		// $picker_date = ( empty( $date ) ? '' : esc_attr( date( $this->date_format, strtotime( $date ) ) ) );
-
-		return <<<EOF
+    /**
+     * Attribute to distinguish between date formats, inferred from the schema property export type
+     *
+     * @since  3.2.0
+     * @access protected
+     * @var string $date_format The date format.
+     */
+    protected $date_format;
+
+    /**
+     * Boolean flag to decide if the calendar should include time or not
+     *
+     * @since  3.2.0
+     * @access protected
+     * @var boolean $timepicker A boolean flag.
+     */
+    protected $timepicker;
+
+    /**
+     * Whether the calendar should be displayed or not.
+     *
+     * @since  3.14.0
+     * @access protected
+     * @var boolean $no_calendar Whether the calendar should be displayed or not.
+     */
+    protected $no_calendar;
+
+    /**
+     * {@inheritdoc}
+     */
+    public function __construct( $args ) {
+        parent::__construct( $args );
+
+        $this->no_calendar = false;
+
+        // Distinguish between date and datetime
+        if ( isset( $this->raw_custom_field['export_type'] ) && 'xsd:datetime' === $this->raw_custom_field['export_type'] ) {
+            $this->date_format = 'Y/m/d H:i';
+            $this->timepicker  = true;
+        } else {
+            $this->date_format = 'Y/m/d';
+            $this->timepicker  = false;
+        }
+
+    }
+
+    /**
+     * @param mixed $date
+     *
+     * @return string
+     */
+    public function html_input( $date ) {
+
+        // $picker_date = ( empty( $date ) ? '' : esc_attr( date( $this->date_format, strtotime( $date ) ) ) );
+
+        return <<<EOF
 			<div class="wl-input-wrapper">
 				<input type="text" class="$this->meta_name" name="wl_metaboxes[$this->meta_name][]" value="$date" style="width:88%" />
 				<button class="button wl-remove-input wl-button" type="button">Remove</button>
 			</div>
 EOF;
-	}
+    }
 
-	public function html_wrapper_close() {
+    public function html_wrapper_close() {
 
-		// Should the widget include time picker?
-		$timepicker  = json_encode( $this->timepicker );
-		$date_format = json_encode( $this->date_format );
-		$no_calendar = json_encode( $this->no_calendar );
+        // Should the widget include time picker?
+        $timepicker  = json_encode( $this->timepicker );
+        $date_format = json_encode( $this->date_format );
+        $no_calendar = json_encode( $this->no_calendar );
 
-		// Set up the datetimepicker.
-		//
-		// See https://github.com/trentrichardson/jQuery-Timepicker-Addon
-		// See in http://trentrichardson.com/examples/timepicker.
-		$html = <<<EOF
+        // Set up the datetimepicker.
+        //
+        // See https://github.com/trentrichardson/jQuery-Timepicker-Addon
+        // See in http://trentrichardson.com/examples/timepicker.
+        $html = <<<EOF
 			<script type='text/javascript'>
 				( function( $ ) {
 
@@ -109,9 +109,9 @@ 
 			</script>
 EOF;
 
-		$html .= parent::html_wrapper_close();
+        $html .= parent::html_wrapper_close();
 
-		return $html;
-	}
+        return $html;
+    }
 
 }

Spacing +7 added lines, -7 removed lines

@@ -48,13 +48,13 @@ 
 	/**
 	 * {@inheritdoc}
 	 */
-	public function __construct( $args ) {
-		parent::__construct( $args );
+	public function __construct($args) {
+		parent::__construct($args);
 
 		$this->no_calendar = false;
 
 		// Distinguish between date and datetime
-		if ( isset( $this->raw_custom_field['export_type'] ) && 'xsd:datetime' === $this->raw_custom_field['export_type'] ) {
+		if (isset($this->raw_custom_field['export_type']) && 'xsd:datetime' === $this->raw_custom_field['export_type']) {
 			$this->date_format = 'Y/m/d H:i';
 			$this->timepicker  = true;
 		} else {
@@ -69,7 +69,7 @@ 
 	 *
 	 * @return string
 	 */
-	public function html_input( $date ) {
+	public function html_input($date) {
 
 		// $picker_date = ( empty( $date ) ? '' : esc_attr( date( $this->date_format, strtotime( $date ) ) ) );
 
@@ -84,9 +84,9 @@ 
 	public function html_wrapper_close() {
 
 		// Should the widget include time picker?
-		$timepicker  = json_encode( $this->timepicker );
-		$date_format = json_encode( $this->date_format );
-		$no_calendar = json_encode( $this->no_calendar );
+		$timepicker  = json_encode($this->timepicker);
+		$date_format = json_encode($this->date_format);
+		$no_calendar = json_encode($this->no_calendar);
 
 		// Set up the datetimepicker.
 		//

src/admin/WL_Metabox/class-wordlift-metabox-field-multiline.php

Indentation +9 added lines, -9 removed lines

@@ -18,20 +18,20 @@
  */
 class Wordlift_Metabox_Field_Multiline extends WL_Metabox_Field {
 
-	/**
-	 * @inheritdoc
-	 */
-	public function html_input( $text ) {
+    /**
+     * @inheritdoc
+     */
+    public function html_input( $text ) {
 
-		$esc_text      = esc_textarea( $text );
-		$esc_meta_name = esc_attr( $this->meta_name );
-		$html          = <<<EOF
+        $esc_text      = esc_textarea( $text );
+        $esc_meta_name = esc_attr( $this->meta_name );
+        $html          = <<<EOF
 			<div class="wl-input-wrapper">
 				<textarea id="$esc_meta_name" class="$esc_meta_name" name="wl_metaboxes[$esc_meta_name][]" style="width:88%">$esc_text</textarea>
 				<button class="button wl-remove-input wl-button" type="button">Remove</button>
 			</div>
 EOF;
 
-		return $html;
-	}
+        return $html;
+    }
 }

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

Indentation +250 added lines, -250 removed lines

@@ -25,295 +25,295 @@
  */
 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 ) {
+    /**
+     * 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 );
+        // Build Field objects.
+        $this->instantiate_fields( $entity_id );
 
-		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			return;
-		}
+        // Check if WL metabox form was posted.
+        if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+            return;
+        }
 
-		foreach ( $this->fields as $field ) {
+        foreach ( $this->fields as $field ) {
 
-			// Verify nonce.
-			$valid_nonce = $field->verify_nonce();
-			if ( $valid_nonce ) {
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+            if ( $valid_nonce ) {
 
-				$posted_data = $_POST['wl_metaboxes'];
-				$field_name  = $field->meta_name;
+                $posted_data = $_POST['wl_metaboxes'];
+                $field_name  = $field->meta_name;
 
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
+                // Each Filed only deals with its values.
+                if ( isset( $posted_data[ $field_name ] ) ) {
 
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
-					}
-
-					// 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() {
-
-		// Use the minified version if PW_DEBUG isn't set.
-		$min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
+                    $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() {
+
+        // Use the minified version if PW_DEBUG isn't set.
+        $min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
 
-		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+        // Load the jquery-ui-timepicker-addon library.
+        wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
+        wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
 
-		// 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__ );
+        // 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',
-			)
-		);
+        // 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 +65 added lines, -65 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,20 +296,20 @@ 
 	public function enqueue_scripts_and_styles() {
 
 		// Use the minified version if PW_DEBUG isn't set.
-		$min = ! defined( 'WP_DEBUG' ) || ! WP_DEBUG ? '.min' : '';
+		$min = ! defined('WP_DEBUG') || ! WP_DEBUG ? '.min' : '';
 
 		// Load the jquery-ui-timepicker-addon library.
-		wp_enqueue_style( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( plugin_dir_url( __FILE__ ) ) . "/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+		wp_enqueue_style('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.css", array(), '3.0.6');
+		wp_enqueue_script('wl-flatpickr', dirname(plugin_dir_url(__FILE__))."/js/flatpickr/flatpickr$min.js", array('jquery'), '3.0.6', true);
 
 		// 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/modules/analyzer/wordlift_analyzer.php

Indentation +51 added lines, -51 removed lines

@@ -10,22 +10,22 @@ 
  */
 function wl_ajax_analyze_action() {
 
-	try {
-		if ( $analysis = wl_analyze_content( file_get_contents( "php://input" ) ) ) {
-			header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-			echo( $analysis );
-			wp_die();
-		}
-
-		status_header( 500 );
-		wp_send_json( __( 'An error occurred while request an analysis to the remote service. Please try again later.', 'wordlift' ) );
-
-	} catch ( Exception $e ) {
-		wp_send_json_error( array(
-			'code'    => $e->getCode(),
-			'message' => $e->getMessage(),
-		) );
-	}
+    try {
+        if ( $analysis = wl_analyze_content( file_get_contents( "php://input" ) ) ) {
+            header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
+            echo( $analysis );
+            wp_die();
+        }
+
+        status_header( 500 );
+        wp_send_json( __( 'An error occurred while request an analysis to the remote service. Please try again later.', 'wordlift' ) );
+
+    } catch ( Exception $e ) {
+        wp_send_json_error( array(
+            'code'    => $e->getCode(),
+            'message' => $e->getMessage(),
+        ) );
+    }
 
 }
 
@@ -47,51 +47,51 @@ 
  */
 function wl_analyze_content( $content ) {
 
-	// Get the analyzer URL.
-	$url = wl_configuration_get_analyzer_url();
+    // Get the analyzer URL.
+    $url = wl_configuration_get_analyzer_url();
 
-	// Set the content type to the request content type or to text/plain by default.
-	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
+    // Set the content type to the request content type or to text/plain by default.
+    $content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
-	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
-		'method'      => 'POST',
-		'headers'     => array(
-			'Accept'       => 'application/json',
-			'Content-type' => $content_type,
-		),
-		// we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
-		'httpversion' => '1.0',
-		'body'        => $content,
-	) );
+    // Prepare the request.
+    $args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+        'method'      => 'POST',
+        'headers'     => array(
+            'Accept'       => 'application/json',
+            'Content-type' => $content_type,
+        ),
+        // we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
+        'httpversion' => '1.0',
+        'body'        => $content,
+    ) );
 
-	$response = wp_remote_post( $url, $args );
+    $response = wp_remote_post( $url, $args );
 
-	// If it's an error log it.
-	if ( is_wp_error( $response ) ) {
+    // If it's an error log it.
+    if ( is_wp_error( $response ) ) {
 
-		$message = "An error occurred while requesting an analysis to $url: {$response->get_error_message()}";
+        $message = "An error occurred while requesting an analysis to $url: {$response->get_error_message()}";
 
-		Wordlift_Log_Service::get_logger( 'wl_analyze_content' )->error( $message );
+        Wordlift_Log_Service::get_logger( 'wl_analyze_content' )->error( $message );
 
-		throw new Exception( $response->get_error_message(), is_numeric( $response->get_error_code() ) ? $response->get_error_code() : - 1 );
-	}
+        throw new Exception( $response->get_error_message(), is_numeric( $response->get_error_code() ) ? $response->get_error_code() : - 1 );
+    }
 
-	// Get the status code.
-	$status_code = (int) $response['response']['code'];
+    // Get the status code.
+    $status_code = (int) $response['response']['code'];
 
-	// If status code is OK, return the body.
-	if ( 200 === $status_code ) {
-		return $response['body'];
-	}
+    // If status code is OK, return the body.
+    if ( 200 === $status_code ) {
+        return $response['body'];
+    }
 
-	// Invalid request, e.g. invalid key.
-	if ( 400 === $status_code ) {
-		$error = json_decode( $response['body'] );
+    // Invalid request, e.g. invalid key.
+    if ( 400 === $status_code ) {
+        $error = json_decode( $response['body'] );
 
-		throw new Exception( $error->message, $error->code );
-	}
+        throw new Exception( $error->message, $error->code );
+    }
 
-	// Another generic error.
-	throw new Exception( "An error occurred.", $status_code );;
+    // Another generic error.
+    throw new Exception( "An error occurred.", $status_code );;
 }

Spacing +22 added lines, -22 removed lines

@@ -11,25 +11,25 @@ 
 function wl_ajax_analyze_action() {
 
 	try {
-		if ( $analysis = wl_analyze_content( file_get_contents( "php://input" ) ) ) {
-			header( 'Content-Type: application/json; charset=' . get_option( 'blog_charset' ) );
-			echo( $analysis );
+		if ($analysis = wl_analyze_content(file_get_contents("php://input"))) {
+			header('Content-Type: application/json; charset='.get_option('blog_charset'));
+			echo($analysis);
 			wp_die();
 		}
 
-		status_header( 500 );
-		wp_send_json( __( 'An error occurred while request an analysis to the remote service. Please try again later.', 'wordlift' ) );
+		status_header(500);
+		wp_send_json(__('An error occurred while request an analysis to the remote service. Please try again later.', 'wordlift'));
 
-	} catch ( Exception $e ) {
-		wp_send_json_error( array(
+	} catch (Exception $e) {
+		wp_send_json_error(array(
 			'code'    => $e->getCode(),
 			'message' => $e->getMessage(),
-		) );
+		));
 	}
 
 }
 
-add_action( 'wp_ajax_wordlift_analyze', 'wl_ajax_analyze_action' );
+add_action('wp_ajax_wordlift_analyze', 'wl_ajax_analyze_action');
 
 /**
  * Analyze the provided content. The analysis will make use of the method *wl_ajax_analyze_action*
@@ -45,16 +45,16 @@ 
  *
  * @throws Exception
  */
-function wl_analyze_content( $content ) {
+function wl_analyze_content($content) {
 
 	// Get the analyzer URL.
 	$url = wl_configuration_get_analyzer_url();
 
 	// Set the content type to the request content type or to text/plain by default.
-	$content_type = isset( $_SERVER['CONTENT_TYPE'] ) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
+	$content_type = isset($_SERVER['CONTENT_TYPE']) ? $_SERVER['CONTENT_TYPE'] : 'text/plain';
 
 	// Prepare the request.
-	$args = array_merge_recursive( unserialize( WL_REDLINK_API_HTTP_OPTIONS ), array(
+	$args = array_merge_recursive(unserialize(WL_REDLINK_API_HTTP_OPTIONS), array(
 		'method'      => 'POST',
 		'headers'     => array(
 			'Accept'       => 'application/json',
@@ -63,35 +63,35 @@ 
 		// we need to downgrade the HTTP version in this case since chunked encoding is dumping numbers in the response.
 		'httpversion' => '1.0',
 		'body'        => $content,
-	) );
+	));
 
-	$response = wp_remote_post( $url, $args );
+	$response = wp_remote_post($url, $args);
 
 	// If it's an error log it.
-	if ( is_wp_error( $response ) ) {
+	if (is_wp_error($response)) {
 
 		$message = "An error occurred while requesting an analysis to $url: {$response->get_error_message()}";
 
-		Wordlift_Log_Service::get_logger( 'wl_analyze_content' )->error( $message );
+		Wordlift_Log_Service::get_logger('wl_analyze_content')->error($message);
 
-		throw new Exception( $response->get_error_message(), is_numeric( $response->get_error_code() ) ? $response->get_error_code() : - 1 );
+		throw new Exception($response->get_error_message(), is_numeric($response->get_error_code()) ? $response->get_error_code() : - 1);
 	}
 
 	// Get the status code.
 	$status_code = (int) $response['response']['code'];
 
 	// If status code is OK, return the body.
-	if ( 200 === $status_code ) {
+	if (200 === $status_code) {
 		return $response['body'];
 	}
 
 	// Invalid request, e.g. invalid key.
-	if ( 400 === $status_code ) {
-		$error = json_decode( $response['body'] );
+	if (400 === $status_code) {
+		$error = json_decode($response['body']);
 
-		throw new Exception( $error->message, $error->code );
+		throw new Exception($error->message, $error->code);
 	}
 
 	// Another generic error.
-	throw new Exception( "An error occurred.", $status_code );;
+	throw new Exception("An error occurred.", $status_code); ;
 }

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

Indentation +424 added lines, -424 removed lines

@@ -10,436 +10,436 @@
  */
 class Wordlift_User_Service {
 
-	/**
-	 * The meta key where the user's URI is stored.
-	 *
-	 * @since 3.1.7
-	 */
-	const URI_META_KEY = '_wl_uri';
-
-	/**
-	 * The user meta key where the deny entity edit flag is stored.
-	 *
-	 * @since 3.14.0
-	 */
-	const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
-
-	/**
-	 * The meta key holding the entity id representing a {@link WP_User}.
-	 *
-	 * @since 3.14.0
-	 */
-	const ENTITY_META_KEY = '_wl_entity';
-
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_Log_Service $log_service The Log service.
-	 */
-	private $log_service;
-
-	/**
-	 * The singleton instance of the User service.
-	 *
-	 * @since  3.1.7
-	 * @access private
-	 * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
-	 */
-	private static $instance;
-
-	/**
-	 * Create an instance of the User service.
-	 *
-	 * @since 3.1.7
-	 */
-	public function __construct() {
-
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
-
-		self::$instance = $this;
-
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
-	}
-
-	/**
-	 * Get the singleton instance of the User service.
-	 *
-	 * @since 3.1.7
-	 * @return \Wordlift_User_Service The singleton instance of the User service.
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Get the URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	public function get_uri( $user_id ) {
-
-		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
-			return $user_uri;
-		}
-
-		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
-
-		return $user_uri;
-	}
-
-	/**
-	 * Receives wp_insert_post events.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int     $post_id Post ID.
-	 * @param WP_Post $post    Post object.
-	 * @param bool    $update  Whether this is an existing post being updated or not.
-	 */
-	public function wp_insert_post( $post_id, $post, $update ) {
-
-		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
-			return;
-		}
-
-		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
-			return;
-		}
-
-		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
-			return;
-		}
-
-		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
-
-	}
-
-	/**
-	 * Set the `id` of the entity representing a {@link WP_User}.
-	 *
-	 * If the `id` is set to 0 (or less) then the meta is deleted.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User}.
-	 * @param int $value   The entity {@link WP_Post} `id`.
-	 *
-	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
-	 */
-	public function set_entity( $user_id, $value ) {
-
-		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
-	}
-
-	/**
-	 * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User}'s `id`.
-	 *
-	 * @return string The entity {@link WP_Post} `id` or an empty string if not set.
-	 */
-	public function get_entity( $user_id ) {
-
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
-	}
-
-	/**
-	 * Get the user's URI stored in the user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The user's URI or false if not found.
-	 */
-	private function _get_uri( $user_id ) {
-
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
-
-		if ( empty( $user_uri ) ) {
-			return false;
-		}
-
-		return $user_uri;
-	}
-
-	/**
-	 * Build an URI for a user.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user's id.
-	 *
-	 * @return false|string The user's URI or false in case of failure.
-	 */
-	private function _build_uri( $user_id ) {
-
-		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
-			return false;
-		}
-
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
-	}
-
-	/**
-	 * Store the URI in user's meta.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int    $user_id  The user's id.
-	 * @param string $user_uri The user's uri.
-	 *
-	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
-	 */
-	private function _set_uri( $user_id, $user_uri ) {
-
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
-	}
-
-	/**
-	 * Get the delete query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The delete query or false in case of failure.
-	 */
-	private function get_delete_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Build the delete query.
-		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
-		                               ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
-		                                 ->build()
-		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
-		                                 ->build();
-
-		return $query;
-	}
-
-	/**
-	 * Get the insert query.
-	 *
-	 * @since 3.1.7
-	 *
-	 * @param int $user_id The user id.
-	 *
-	 * @return false|string The insert query or false in case of failure.
-	 */
-	private function get_insert_query( $user_id ) {
-
-		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
-			return false;
-		}
-
-		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
-			return false;
-		};
-
-		// Build the insert query.
-		$query = Wordlift_Query_Builder::new_instance()
-		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
-		                               ->build();
-
-		return $query;
-	}
-
-	/**
-	 * Mark an editor user as denied from editing entities.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	public function deny_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
-
-	}
-
-	/**
-	 * Remove the "deny entity editing" mark from an editor user.
-	 * Does nothing if the user is not an editor
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param integer $user_id The ID of the user
-	 */
-	public function allow_editor_entity_create( $user_id ) {
-
-		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return;
-		}
-
-		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
-
-	}
-
-	/**
-	 * Get whether the 'deny editor entity editing' flag is set.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return int bool True if editing is denied otherwise false.
-	 */
-	public function is_deny_editor_entity_create( $user_id ) {
-
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
-	}
-
-	/**
-	 * Check whether the {@link WP_User} with the specified `id` is an editor,
-	 * i.e. has the `editor` role.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The {@link WP_User} `id`.
-	 *
-	 * @return bool True if the {@link WP_User} is an editor otherwise false.
-	 */
-	public function is_editor( $user_id ) {
-
-		// Get the user.
-		$user = get_user_by( 'id', $user_id );
-
-		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
-	}
-
-	/**
-	 * Check if an editor can create entities.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param int $user_id The user id of the user being checked.
-	 *
-	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
-	 */
-	public function editor_can_create_entities( $user_id ) {
-
-		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
-			return true;
-		}
-
-		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
-	}
-
-	/**
-	 * Filter capabilities of user.
-	 *
-	 * Deny the capability of managing and editing entities for some users.
-	 *
-	 * @since 3.14.0
-	 *
-	 * @param array $allcaps All the capabilities of the user
-	 * @param array $cap     [0] Required capability
-	 * @param array $args    [0] Requested capability
-	 *                       [1] User ID
-	 *                       [2] Associated object ID
-	 *
-	 * @return array The capabilities array.
-	 */
-	public function has_cap( $allcaps, $cap, $args ) {
-		/*
+    /**
+     * The meta key where the user's URI is stored.
+     *
+     * @since 3.1.7
+     */
+    const URI_META_KEY = '_wl_uri';
+
+    /**
+     * The user meta key where the deny entity edit flag is stored.
+     *
+     * @since 3.14.0
+     */
+    const DENY_ENTITY_CREATE_META_KEY = '_wl_deny_entity_create';
+
+    /**
+     * The meta key holding the entity id representing a {@link WP_User}.
+     *
+     * @since 3.14.0
+     */
+    const ENTITY_META_KEY = '_wl_entity';
+
+    /**
+     * The Log service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_Log_Service $log_service The Log service.
+     */
+    private $log_service;
+
+    /**
+     * The singleton instance of the User service.
+     *
+     * @since  3.1.7
+     * @access private
+     * @var \Wordlift_User_Service $user_service The singleton instance of the User service.
+     */
+    private static $instance;
+
+    /**
+     * Create an instance of the User service.
+     *
+     * @since 3.1.7
+     */
+    public function __construct() {
+
+        $this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+
+        self::$instance = $this;
+
+        add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+    }
+
+    /**
+     * Get the singleton instance of the User service.
+     *
+     * @since 3.1.7
+     * @return \Wordlift_User_Service The singleton instance of the User service.
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Get the URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    public function get_uri( $user_id ) {
+
+        // Try to get the URI stored in the user's meta and return it if available.
+        if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+            return $user_uri;
+        }
+
+        // Try to build an URI, return false in case of failure.
+        if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Store the URI for future requests (we need a "permanent" URI).
+        $this->_set_uri( $user_id, $user_uri );
+
+        return $user_uri;
+    }
+
+    /**
+     * Receives wp_insert_post events.
+     *
+     * @since 3.1.7
+     *
+     * @param int     $post_id Post ID.
+     * @param WP_Post $post    Post object.
+     * @param bool    $update  Whether this is an existing post being updated or not.
+     */
+    public function wp_insert_post( $post_id, $post, $update ) {
+
+        // If the post is not published, return.
+        if ( 'publish' !== get_post_status( $post_id ) ) {
+            return;
+        }
+
+        // We expect a numeric author id.
+        if ( ! is_numeric( $post->post_author ) ) {
+            return;
+        }
+
+        // Get the delete query,or return in case of failure.
+        if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Get the insert query,or return in case of failure.
+        if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+            return;
+        }
+
+        // Send the query to the triple store.
+        rl_execute_sparql_update_query( $delete . $insert );
+
+    }
+
+    /**
+     * Set the `id` of the entity representing a {@link WP_User}.
+     *
+     * If the `id` is set to 0 (or less) then the meta is deleted.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User}.
+     * @param int $value   The entity {@link WP_Post} `id`.
+     *
+     * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
+     */
+    public function set_entity( $user_id, $value ) {
+
+        return 0 < $value
+            ? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
+            : delete_user_meta( $user_id, self::ENTITY_META_KEY );
+    }
+
+    /**
+     * Get the {@link WP_Post} `id` of the entity representing a {@link WP_User}.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User}'s `id`.
+     *
+     * @return string The entity {@link WP_Post} `id` or an empty string if not set.
+     */
+    public function get_entity( $user_id ) {
+
+        return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+    }
+
+    /**
+     * Get the user's URI stored in the user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The user's URI or false if not found.
+     */
+    private function _get_uri( $user_id ) {
+
+        $user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+
+        if ( empty( $user_uri ) ) {
+            return false;
+        }
+
+        return $user_uri;
+    }
+
+    /**
+     * Build an URI for a user.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user's id.
+     *
+     * @return false|string The user's URI or false in case of failure.
+     */
+    private function _build_uri( $user_id ) {
+
+        // Get the user, return false in case of failure.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // If the nicename is not set, return a failure.
+        if ( empty( $user->user_nicename ) ) {
+            return false;
+        }
+
+        return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+    }
+
+    /**
+     * Store the URI in user's meta.
+     *
+     * @since 3.1.7
+     *
+     * @param int    $user_id  The user's id.
+     * @param string $user_uri The user's uri.
+     *
+     * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
+     */
+    private function _set_uri( $user_id, $user_uri ) {
+
+        return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+    }
+
+    /**
+     * Get the delete query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The delete query or false in case of failure.
+     */
+    private function get_delete_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Build the delete query.
+        $query = Wordlift_Query_Builder::new_instance()->delete()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+                                        ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+                                            ->build()
+                    . Wordlift_Query_Builder::new_instance()->delete()
+                                            ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+                                            ->build();
+
+        return $query;
+    }
+
+    /**
+     * Get the insert query.
+     *
+     * @since 3.1.7
+     *
+     * @param int $user_id The user id.
+     *
+     * @return false|string The insert query or false in case of failure.
+     */
+    private function get_insert_query( $user_id ) {
+
+        // Get the URI, return if there's none.
+        if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+            return false;
+        }
+
+        // Try to get the user data, in case of failure return false.
+        if ( false === ( $user = get_userdata( $user_id ) ) ) {
+            return false;
+        };
+
+        // Build the insert query.
+        $query = Wordlift_Query_Builder::new_instance()
+                                        ->insert()
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
+                                        ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+                                        ->build();
+
+        return $query;
+    }
+
+    /**
+     * Mark an editor user as denied from editing entities.
+     * Does nothing if the user is not an editor
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    public function deny_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+
+    }
+
+    /**
+     * Remove the "deny entity editing" mark from an editor user.
+     * Does nothing if the user is not an editor
+     *
+     * @since 3.14.0
+     *
+     * @param integer $user_id The ID of the user
+     */
+    public function allow_editor_entity_create( $user_id ) {
+
+        // Bail out if the user is not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return;
+        }
+
+        // The user explicitly do not have the capability.
+        delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+
+    }
+
+    /**
+     * Get whether the 'deny editor entity editing' flag is set.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return int bool True if editing is denied otherwise false.
+     */
+    public function is_deny_editor_entity_create( $user_id ) {
+
+        return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+    }
+
+    /**
+     * Check whether the {@link WP_User} with the specified `id` is an editor,
+     * i.e. has the `editor` role.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The {@link WP_User} `id`.
+     *
+     * @return bool True if the {@link WP_User} is an editor otherwise false.
+     */
+    public function is_editor( $user_id ) {
+
+        // Get the user.
+        $user = get_user_by( 'id', $user_id );
+
+        // Return true, if the user is found and has the `editor` role.
+        return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
+    }
+
+    /**
+     * Check if an editor can create entities.
+     *
+     * @since 3.14.0
+     *
+     * @param int $user_id The user id of the user being checked.
+     *
+     * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
+     */
+    public function editor_can_create_entities( $user_id ) {
+
+        // Return true if not an editor.
+        if ( ! $this->is_editor( $user_id ) ) {
+            return true;
+        }
+
+        // Check if the user explicitly denied.
+        return ! $this->is_deny_editor_entity_create( $user_id );
+    }
+
+    /**
+     * Filter capabilities of user.
+     *
+     * Deny the capability of managing and editing entities for some users.
+     *
+     * @since 3.14.0
+     *
+     * @param array $allcaps All the capabilities of the user
+     * @param array $cap     [0] Required capability
+     * @param array $args    [0] Requested capability
+     *                       [1] User ID
+     *                       [2] Associated object ID
+     *
+     * @return array The capabilities array.
+     */
+    public function has_cap( $allcaps, $cap, $args ) {
+        /*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
 		 * the capability.
 		 */
 
-		/*
+        /*
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) ) {
-			return $allcaps;
-		}
-		if (
-			( 'edit_wordlift_entity' == $cap[0] ) ||
-			( 'edit_wordlift_entities' == $cap[0] ) ||
-			( 'edit_others_wordlift_entities' == $cap[0] ) ||
-			( 'publish_wordlift_entities' == $cap[0] ) ||
-			( 'read_private_wordlift_entities' == $cap[0] ) ||
-			( 'delete_wordlift_entity' == $cap[0] ) ||
-			( 'delete_wordlift_entities' == $cap[0] ) ||
-			( 'delete_others_wordlift_entities' == $cap[0] ) ||
-			( 'delete_published_wordlift_entities' == $cap[0] ) ||
-			( 'delete_private_wordlift_entities' == $cap[0] )
-		) {
-			$user_id = $args[1];
-
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
-			}
-		}
-
-		return $allcaps;
-	}
+        if ( empty( $cap ) ) {
+            return $allcaps;
+        }
+        if (
+            ( 'edit_wordlift_entity' == $cap[0] ) ||
+            ( 'edit_wordlift_entities' == $cap[0] ) ||
+            ( 'edit_others_wordlift_entities' == $cap[0] ) ||
+            ( 'publish_wordlift_entities' == $cap[0] ) ||
+            ( 'read_private_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_wordlift_entity' == $cap[0] ) ||
+            ( 'delete_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_others_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_published_wordlift_entities' == $cap[0] ) ||
+            ( 'delete_private_wordlift_entities' == $cap[0] )
+        ) {
+            $user_id = $args[1];
+
+            if ( ! $this->editor_can_create_entities( $user_id ) ) {
+                $allcaps[ $cap[0] ] = false;
+            }
+        }
+
+        return $allcaps;
+    }
 }

Spacing +69 added lines, -69 removed lines

@@ -56,11 +56,11 @@ 
 	 */
 	public function __construct() {
 
-		$this->log_service = Wordlift_Log_Service::get_logger( 'Wordlift_User_Service' );
+		$this->log_service = Wordlift_Log_Service::get_logger('Wordlift_User_Service');
 
 		self::$instance = $this;
 
-		add_filter( 'user_has_cap', array( $this, 'has_cap' ), 10, 3 );
+		add_filter('user_has_cap', array($this, 'has_cap'), 10, 3);
 	}
 
 	/**
@@ -83,20 +83,20 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	public function get_uri( $user_id ) {
+	public function get_uri($user_id) {
 
 		// Try to get the URI stored in the user's meta and return it if available.
-		if ( false !== ( $user_uri = $this->_get_uri( $user_id ) ) ) {
+		if (false !== ($user_uri = $this->_get_uri($user_id))) {
 			return $user_uri;
 		}
 
 		// Try to build an URI, return false in case of failure.
-		if ( false === ( $user_uri = $this->_build_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->_build_uri($user_id))) {
 			return false;
 		}
 
 		// Store the URI for future requests (we need a "permanent" URI).
-		$this->_set_uri( $user_id, $user_uri );
+		$this->_set_uri($user_id, $user_uri);
 
 		return $user_uri;
 	}
@@ -110,30 +110,30 @@ 
 	 * @param WP_Post $post    Post object.
 	 * @param bool    $update  Whether this is an existing post being updated or not.
 	 */
-	public function wp_insert_post( $post_id, $post, $update ) {
+	public function wp_insert_post($post_id, $post, $update) {
 
 		// If the post is not published, return.
-		if ( 'publish' !== get_post_status( $post_id ) ) {
+		if ('publish' !== get_post_status($post_id)) {
 			return;
 		}
 
 		// We expect a numeric author id.
-		if ( ! is_numeric( $post->post_author ) ) {
+		if ( ! is_numeric($post->post_author)) {
 			return;
 		}
 
 		// Get the delete query,or return in case of failure.
-		if ( false === ( $delete = $this->get_delete_query( $post->post_author ) ) ) {
+		if (false === ($delete = $this->get_delete_query($post->post_author))) {
 			return;
 		}
 
 		// Get the insert query,or return in case of failure.
-		if ( false === ( $insert = $this->get_insert_query( $post->post_author ) ) ) {
+		if (false === ($insert = $this->get_insert_query($post->post_author))) {
 			return;
 		}
 
 		// Send the query to the triple store.
-		rl_execute_sparql_update_query( $delete . $insert );
+		rl_execute_sparql_update_query($delete.$insert);
 
 	}
 
@@ -149,11 +149,11 @@ 
 	 *
 	 * @return bool|int  Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	public function set_entity( $user_id, $value ) {
+	public function set_entity($user_id, $value) {
 
 		return 0 < $value
-			? update_user_meta( $user_id, self::ENTITY_META_KEY, $value )
-			: delete_user_meta( $user_id, self::ENTITY_META_KEY );
+			? update_user_meta($user_id, self::ENTITY_META_KEY, $value)
+			: delete_user_meta($user_id, self::ENTITY_META_KEY);
 	}
 
 	/**
@@ -165,9 +165,9 @@ 
 	 *
 	 * @return string The entity {@link WP_Post} `id` or an empty string if not set.
 	 */
-	public function get_entity( $user_id ) {
+	public function get_entity($user_id) {
 
-		return get_user_meta( $user_id, self::ENTITY_META_KEY, true );
+		return get_user_meta($user_id, self::ENTITY_META_KEY, true);
 	}
 
 	/**
@@ -179,11 +179,11 @@ 
 	 *
 	 * @return false|string The user's URI or false if not found.
 	 */
-	private function _get_uri( $user_id ) {
+	private function _get_uri($user_id) {
 
-		$user_uri = get_user_meta( $user_id, self::URI_META_KEY, true );
+		$user_uri = get_user_meta($user_id, self::URI_META_KEY, true);
 
-		if ( empty( $user_uri ) ) {
+		if (empty($user_uri)) {
 			return false;
 		}
 
@@ -199,19 +199,19 @@ 
 	 *
 	 * @return false|string The user's URI or false in case of failure.
 	 */
-	private function _build_uri( $user_id ) {
+	private function _build_uri($user_id) {
 
 		// Get the user, return false in case of failure.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// If the nicename is not set, return a failure.
-		if ( empty( $user->user_nicename ) ) {
+		if (empty($user->user_nicename)) {
 			return false;
 		}
 
-		return wl_configuration_get_redlink_dataset_uri() . "/user/$user->user_nicename";
+		return wl_configuration_get_redlink_dataset_uri()."/user/$user->user_nicename";
 	}
 
 	/**
@@ -224,9 +224,9 @@ 
 	 *
 	 * @return int|bool Meta ID if the key didn't exist, true on successful update, false on failure.
 	 */
-	private function _set_uri( $user_id, $user_uri ) {
+	private function _set_uri($user_id, $user_uri) {
 
-		return update_user_meta( $user_id, self::URI_META_KEY, $user_uri );
+		return update_user_meta($user_id, self::URI_META_KEY, $user_uri);
 	}
 
 	/**
@@ -238,28 +238,28 @@ 
 	 *
 	 * @return false|string The delete query or false in case of failure.
 	 */
-	private function get_delete_query( $user_id ) {
+	private function get_delete_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Build the delete query.
 		$query = Wordlift_Query_Builder::new_instance()->delete()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o' )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, '?o')
 		                               ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, '?o')
 		                                 ->build()
 		         . Wordlift_Query_Builder::new_instance()->delete()
-		                                 ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o' )
+		                                 ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, '?o')
 		                                 ->build();
 
 		return $query;
@@ -274,26 +274,26 @@ 
 	 *
 	 * @return false|string The insert query or false in case of failure.
 	 */
-	private function get_insert_query( $user_id ) {
+	private function get_insert_query($user_id) {
 
 		// Get the URI, return if there's none.
-		if ( false === ( $user_uri = $this->get_uri( $user_id ) ) ) {
+		if (false === ($user_uri = $this->get_uri($user_id))) {
 			return false;
 		}
 
 		// Try to get the user data, in case of failure return false.
-		if ( false === ( $user = get_userdata( $user_id ) ) ) {
+		if (false === ($user = get_userdata($user_id))) {
 			return false;
 		};
 
 		// Build the insert query.
 		$query = Wordlift_Query_Builder::new_instance()
 		                               ->insert()
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname )
-		                               ->statement( $user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty( $user->user_url ) ? $user->user_url : get_author_posts_url( $user_id ) ) )
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_TYPE_URI, Wordlift_Query_Builder::SCHEMA_PERSON_URI)
+		                               ->statement($user_uri, Wordlift_Query_Builder::RDFS_LABEL_URI, $user->display_name)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_GIVEN_NAME_URI, $user->user_firstname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_FAMILY_NAME_URI, $user->user_lastname)
+		                               ->statement($user_uri, Wordlift_Query_Builder::SCHEMA_URL_URI, ( ! empty($user->user_url) ? $user->user_url : get_author_posts_url($user_id)))
 		                               ->build();
 
 		return $query;
@@ -307,15 +307,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	public function deny_editor_entity_create( $user_id ) {
+	public function deny_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		update_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes' );
+		update_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY, 'yes');
 
 	}
 
@@ -327,15 +327,15 @@ 
 	 *
 	 * @param integer $user_id The ID of the user
 	 */
-	public function allow_editor_entity_create( $user_id ) {
+	public function allow_editor_entity_create($user_id) {
 
 		// Bail out if the user is not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return;
 		}
 
 		// The user explicitly do not have the capability.
-		delete_user_option( $user_id, self::DENY_ENTITY_CREATE_META_KEY );
+		delete_user_option($user_id, self::DENY_ENTITY_CREATE_META_KEY);
 
 	}
 
@@ -348,9 +348,9 @@ 
 	 *
 	 * @return int bool True if editing is denied otherwise false.
 	 */
-	public function is_deny_editor_entity_create( $user_id ) {
+	public function is_deny_editor_entity_create($user_id) {
 
-		return 'yes' === get_user_option( self::DENY_ENTITY_CREATE_META_KEY, $user_id );
+		return 'yes' === get_user_option(self::DENY_ENTITY_CREATE_META_KEY, $user_id);
 	}
 
 	/**
@@ -363,13 +363,13 @@ 
 	 *
 	 * @return bool True if the {@link WP_User} is an editor otherwise false.
 	 */
-	public function is_editor( $user_id ) {
+	public function is_editor($user_id) {
 
 		// Get the user.
-		$user = get_user_by( 'id', $user_id );
+		$user = get_user_by('id', $user_id);
 
 		// Return true, if the user is found and has the `editor` role.
-		return is_a( $user, 'WP_User' ) && in_array( 'editor', (array) $user->roles );
+		return is_a($user, 'WP_User') && in_array('editor', (array) $user->roles);
 	}
 
 	/**
@@ -381,15 +381,15 @@ 
 	 *
 	 * @return bool    false if it is an editor that is denied from edit entities, true otherwise.
 	 */
-	public function editor_can_create_entities( $user_id ) {
+	public function editor_can_create_entities($user_id) {
 
 		// Return true if not an editor.
-		if ( ! $this->is_editor( $user_id ) ) {
+		if ( ! $this->is_editor($user_id)) {
 			return true;
 		}
 
 		// Check if the user explicitly denied.
-		return ! $this->is_deny_editor_entity_create( $user_id );
+		return ! $this->is_deny_editor_entity_create($user_id);
 	}
 
 	/**
@@ -407,7 +407,7 @@ 
 	 *
 	 * @return array The capabilities array.
 	 */
-	public function has_cap( $allcaps, $cap, $args ) {
+	public function has_cap($allcaps, $cap, $args) {
 		/*
 		 * For entity management/editing related capabilities
 		 * check that an editor was not explicitly denied (in user profile)
@@ -418,25 +418,25 @@ 
 		 * Need protection against the case of edit_user and likes which do not
 		 * require a capability, just request one.
 		 */
-		if ( empty( $cap ) ) {
+		if (empty($cap)) {
 			return $allcaps;
 		}
 		if (
-			( 'edit_wordlift_entity' == $cap[0] ) ||
-			( 'edit_wordlift_entities' == $cap[0] ) ||
-			( 'edit_others_wordlift_entities' == $cap[0] ) ||
-			( 'publish_wordlift_entities' == $cap[0] ) ||
-			( 'read_private_wordlift_entities' == $cap[0] ) ||
-			( 'delete_wordlift_entity' == $cap[0] ) ||
-			( 'delete_wordlift_entities' == $cap[0] ) ||
-			( 'delete_others_wordlift_entities' == $cap[0] ) ||
-			( 'delete_published_wordlift_entities' == $cap[0] ) ||
-			( 'delete_private_wordlift_entities' == $cap[0] )
+			('edit_wordlift_entity' == $cap[0]) ||
+			('edit_wordlift_entities' == $cap[0]) ||
+			('edit_others_wordlift_entities' == $cap[0]) ||
+			('publish_wordlift_entities' == $cap[0]) ||
+			('read_private_wordlift_entities' == $cap[0]) ||
+			('delete_wordlift_entity' == $cap[0]) ||
+			('delete_wordlift_entities' == $cap[0]) ||
+			('delete_others_wordlift_entities' == $cap[0]) ||
+			('delete_published_wordlift_entities' == $cap[0]) ||
+			('delete_private_wordlift_entities' == $cap[0])
 		) {
 			$user_id = $args[1];
 
-			if ( ! $this->editor_can_create_entities( $user_id ) ) {
-				$allcaps[ $cap[0] ] = false;
+			if ( ! $this->editor_can_create_entities($user_id)) {
+				$allcaps[$cap[0]] = false;
 			}
 		}