insideout10 / wordlift-plugin

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

Indentation +134 added lines, -134 removed lines

@@ -18,145 +18,145 @@
  */
 class Wordlift_Geomap_Shortcode extends Wordlift_Shortcode {
 
-	const SHORTCODE = 'wl_geomap';
-
-	/**
-	 * Create a {@link Wordlift_Geomap_Shortcode} instance.
-	 *
-	 * @since 3.5.4
-	 */
-	public function __construct() {
-		parent::__construct();
-
-		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
-		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
-		$this->register_block_type();
-
-	}
-
-	/**
-	 * Render the shortcode.
-	 *
-	 * @param array $atts An array of shortcode attributes as set by the editor.
-	 *
-	 * @return string The output html code.
-	 * @since 3.5.4
-	 *
-	 */
-	public function render( $atts ) {
-
-		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
-			'width'  => '100%',
-			'height' => '300px',
-			'global' => false,
-		), $atts );
-
-		// Get id of the post
-		$post_id = get_the_ID();
-
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
-			// Global geomap
-			$geomap_id = 'wl_geomap_global';
-			$post_id   = null;
-		} else {
-			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
-		}
-
-
-		wl_enqueue_leaflet( true );
-
-		// Use the registered style which define an optional dependency to font-awesome.
-		//
-		// @see https://github.com/insideout10/wordlift-plugin/issues/699
-		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
-
-		$this->enqueue_scripts();
-
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
-			'action'   => 'wl_geomap'            // Global param
-		) );
-
-		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
-
-		// Return HTML template.
-		return <<<EOF
+    const SHORTCODE = 'wl_geomap';
+
+    /**
+     * Create a {@link Wordlift_Geomap_Shortcode} instance.
+     *
+     * @since 3.5.4
+     */
+    public function __construct() {
+        parent::__construct();
+
+        // Hook to the `amp_post_template_css` to hide ourselves when in AMP
+        // rendering.
+        add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+        $this->register_block_type();
+
+    }
+
+    /**
+     * Render the shortcode.
+     *
+     * @param array $atts An array of shortcode attributes as set by the editor.
+     *
+     * @return string The output html code.
+     * @since 3.5.4
+     *
+     */
+    public function render( $atts ) {
+
+        // Extract attributes and set default values.
+        $geomap_atts = shortcode_atts( array(
+            'width'  => '100%',
+            'height' => '300px',
+            'global' => false,
+        ), $atts );
+
+        // Get id of the post
+        $post_id = get_the_ID();
+
+        if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+            // Global geomap
+            $geomap_id = 'wl_geomap_global';
+            $post_id   = null;
+        } else {
+            // Post-specific geomap
+            $geomap_id = 'wl_geomap_' . $post_id;
+        }
+
+
+        wl_enqueue_leaflet( true );
+
+        // Use the registered style which define an optional dependency to font-awesome.
+        //
+        // @see https://github.com/insideout10/wordlift-plugin/issues/699
+        //		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
+        wp_enqueue_style( 'wordlift-ui' );
+
+        $this->enqueue_scripts();
+
+        wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
+            'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+            'action'   => 'wl_geomap'            // Global param
+        ) );
+
+        // Escaping atts.
+        $esc_id      = esc_attr( $geomap_id );
+        $esc_width   = esc_attr( $geomap_atts['width'] );
+        $esc_height  = esc_attr( $geomap_atts['height'] );
+        $esc_post_id = esc_attr( $post_id );
+
+        // Return HTML template.
+        return <<<EOF
 <div class="wl-geomap"  id="$esc_id" data-post-id="$esc_post_id"
 	style="width:$esc_width; height:$esc_height; background-color: gray;">
 </div>
 EOF;
-	}
-
-	private function register_block_type() {
-
-		$scope = $this;
-
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
-				// Gutenberg is not active.
-				return;
-			}
-
-			register_block_type( 'wordlift/geomap', array(
-				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
-					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
-					}
-
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
-				},
-				'attributes'      => array(
-					'width'  => array(
-						'type'    => 'string',
-						'default' => '100%'
-					),
-					'height' => array(
-						'type'    => 'string',
-						'default' => '300px'
-					),
-					'global' => array(
-						'type'    => 'boolean',
-						'default' => false
-					),
-					'preview'     => array(
-						'type'    => 'boolean',
-						'default' => false,
-					),
-					'preview_src'     => array(
-						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
-					),
-				),
-			) );
-		} );
-	}
-
-	/**
-	 * Customize the CSS when in AMP.
-	 *
-	 * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
-	 *
-	 * @param object $amp_template The template.
-	 *
-	 * @since 3.13.0
-	 *
-	 */
-	public function amp_post_template_css( $amp_template ) {
-
-		// Hide the `wl-geomap` when in AMP.
-		?>
+    }
+
+    private function register_block_type() {
+
+        $scope = $this;
+
+        add_action( 'init', function () use ( $scope ) {
+            if ( ! function_exists( 'register_block_type' ) ) {
+                // Gutenberg is not active.
+                return;
+            }
+
+            register_block_type( 'wordlift/geomap', array(
+                'editor_script'   => 'wl-block-editor',
+                'render_callback' => function ( $attributes ) use ( $scope ) {
+                    $attr_code = '';
+                    foreach ( $attributes as $key => $value ) {
+                        $attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+                    }
+
+                    return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+                },
+                'attributes'      => array(
+                    'width'  => array(
+                        'type'    => 'string',
+                        'default' => '100%'
+                    ),
+                    'height' => array(
+                        'type'    => 'string',
+                        'default' => '300px'
+                    ),
+                    'global' => array(
+                        'type'    => 'boolean',
+                        'default' => false
+                    ),
+                    'preview'     => array(
+                        'type'    => 'boolean',
+                        'default' => false,
+                    ),
+                    'preview_src'     => array(
+                        'type'    => 'string',
+                        'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+                    ),
+                ),
+            ) );
+        } );
+    }
+
+    /**
+     * Customize the CSS when in AMP.
+     *
+     * See https://github.com/Automattic/amp-wp/blob/master/readme.md#custom-css
+     *
+     * @param object $amp_template The template.
+     *
+     * @since 3.13.0
+     *
+     */
+    public function amp_post_template_css( $amp_template ) {
+
+        // Hide the `wl-geomap` when in AMP.
+        ?>
         .wl-geomap { display: none; }
 		<?php
-	}
+    }
 
 }

Spacing +25 added lines, -25 removed lines

@@ -30,7 +30,7 @@ 
 
 		// Hook to the `amp_post_template_css` to hide ourselves when in AMP
 		// rendering.
-		add_action( 'amp_post_template_css', array( $this, 'amp_post_template_css', ) );
+		add_action('amp_post_template_css', array($this, 'amp_post_template_css',));
 		$this->register_block_type();
 
 	}
@@ -44,48 +44,48 @@ 
 	 * @since 3.5.4
 	 *
 	 */
-	public function render( $atts ) {
+	public function render($atts) {
 
 		// Extract attributes and set default values.
-		$geomap_atts = shortcode_atts( array(
+		$geomap_atts = shortcode_atts(array(
 			'width'  => '100%',
 			'height' => '300px',
 			'global' => false,
-		), $atts );
+		), $atts);
 
 		// Get id of the post
 		$post_id = get_the_ID();
 
-		if ( $geomap_atts['global'] || is_null( $post_id ) ) {
+		if ($geomap_atts['global'] || is_null($post_id)) {
 			// Global geomap
 			$geomap_id = 'wl_geomap_global';
 			$post_id   = null;
 		} else {
 			// Post-specific geomap
-			$geomap_id = 'wl_geomap_' . $post_id;
+			$geomap_id = 'wl_geomap_'.$post_id;
 		}
 
 
-		wl_enqueue_leaflet( true );
+		wl_enqueue_leaflet(true);
 
 		// Use the registered style which define an optional dependency to font-awesome.
 		//
 		// @see https://github.com/insideout10/wordlift-plugin/issues/699
 		//		wp_enqueue_style( 'wordlift-ui', dirname( plugin_dir_url( __FILE__ ) ) . '/css/wordlift-ui.min.css' );
-		wp_enqueue_style( 'wordlift-ui' );
+		wp_enqueue_style('wordlift-ui');
 
 		$this->enqueue_scripts();
 
-		wp_localize_script( 'wordlift-ui', 'wl_geomap_params', array(
-			'ajax_url' => admin_url( 'admin-ajax.php' ),    // Global param
+		wp_localize_script('wordlift-ui', 'wl_geomap_params', array(
+			'ajax_url' => admin_url('admin-ajax.php'), // Global param
 			'action'   => 'wl_geomap'            // Global param
-		) );
+		));
 
 		// Escaping atts.
-		$esc_id      = esc_attr( $geomap_id );
-		$esc_width   = esc_attr( $geomap_atts['width'] );
-		$esc_height  = esc_attr( $geomap_atts['height'] );
-		$esc_post_id = esc_attr( $post_id );
+		$esc_id      = esc_attr($geomap_id);
+		$esc_width   = esc_attr($geomap_atts['width']);
+		$esc_height  = esc_attr($geomap_atts['height']);
+		$esc_post_id = esc_attr($post_id);
 
 		// Return HTML template.
 		return <<<EOF
@@ -99,21 +99,21 @@ 
 
 		$scope = $this;
 
-		add_action( 'init', function () use ( $scope ) {
-			if ( ! function_exists( 'register_block_type' ) ) {
+		add_action('init', function() use ($scope) {
+			if ( ! function_exists('register_block_type')) {
 				// Gutenberg is not active.
 				return;
 			}
 
-			register_block_type( 'wordlift/geomap', array(
+			register_block_type('wordlift/geomap', array(
 				'editor_script'   => 'wl-block-editor',
-				'render_callback' => function ( $attributes ) use ( $scope ) {
+				'render_callback' => function($attributes) use ($scope) {
 					$attr_code = '';
-					foreach ( $attributes as $key => $value ) {
-						$attr_code .= $key . '="' . htmlentities( $value ) . '" ';
+					foreach ($attributes as $key => $value) {
+						$attr_code .= $key.'="'.htmlentities($value).'" ';
 					}
 
-					return '[' . $scope::SHORTCODE . ' ' . $attr_code . ']';
+					return '['.$scope::SHORTCODE.' '.$attr_code.']';
 				},
 				'attributes'      => array(
 					'width'  => array(
@@ -134,10 +134,10 @@ 
 					),
 					'preview_src'     => array(
 						'type'    => 'string',
-						'default' => WP_CONTENT_URL . '/plugins/wordlift/images/block-previews/geomap.png',
+						'default' => WP_CONTENT_URL.'/plugins/wordlift/images/block-previews/geomap.png',
 					),
 				),
-			) );
+			));
 		} );
 	}
 
@@ -151,7 +151,7 @@ 
 	 * @since 3.13.0
 	 *
 	 */
-	public function amp_post_template_css( $amp_template ) {
+	public function amp_post_template_css($amp_template) {
 
 		// Hide the `wl-geomap` when in AMP.
 		?>

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

Indentation +339 added lines, -339 removed lines

@@ -16,344 +16,344 @@
  */
 class Wordlift_Timeline_Service {
 
-	/**
-	 * The Log service.
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Log_Service $log The Log service.
-	 */
-	private $log;
-
-	/**
-	 * The number of words to use for the excerpt, set in the `to_json` function
-	 * and used by a filter.
-	 *
-	 * @since  3.7.0
-	 * @access private
-	 * @var int $excerpt_length The number of words to use for the excerpt.
-	 */
-	private $excerpt_length;
-
-	/**
-	 * A singleton instance of the Timeline service (useful for unit tests).
-	 *
-	 * @since  3.1.0
-	 * @access private
-	 * @var \Wordlift_Timeline_Service $instance The singleton instance.
-	 */
-	private static $instance;
-
-	/**
-	 * Create a Wordlift_Timeline_Service instance.
-	 *
-	 * @since 3.1.0
-	 *
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
-
-		self::$instance = $this;
-
-	}
-
-	/**
-	 * Get the singleton instance of the Wordlift_Timeline_Service
-	 *
-	 * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
-	 * @since 3.1.0
-	 *
-	 */
-	public static function get_instance() {
-
-		return self::$instance;
-	}
-
-	/**
-	 * Retrieve timeline events and output them in JSON.
-	 *
-	 * @since 3.1.0
-	 */
-	public function ajax_timeline() {
-
-		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
-
-		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
-
-	}
-
-	/**
-	 * Retrieve timeline events.
-	 *
-	 * @param int $post_id The post ID.
-	 *
-	 * @return array An array of event posts.
-	 * @since 3.1.0
-	 *
-	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
-	 *
-	 */
-	public function get_events( $post_id = null ) {
-
-		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
-		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
-
-		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
-			$ids[] = $post_id;
-		}
-
-		// If there's no entities, return an empty array right away.
-		if ( 0 === sizeof( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
-
-			return array();
-		}
-
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
-
-		$args = array(
-			'post__in'       => $ids,
-			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
-			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
-			'meta_query'     => array(
-				'relation' => 'AND',
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
-					'value'   => null,
-					'compare' => '!=',
-				),
-				array(
-					'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
-					'value'   => null,
-					'compare' => '!=',
-				),
-			),
-			'tax_query'      => array(
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'event',
-				),
-			),
-			'orderby'        => 'meta_value',
-			'order'          => 'DESC',
-			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
-		);
-
-		return get_posts( $args );
-	}
-
-	/**
-	 * Convert timeline events to JSON. This function sets the global post in order
-	 * to get an automatic excerpt. Since we're being called inside an AJAX request,
-	 * we're not taking care of restoring any previous post: there isn't any.
-	 *
-	 * @param array $posts An array of posts.
-	 *
-	 * @return array|string An array of timeline events or an empty string if no posts are provided.
-	 * @since 3.1.0
-	 *
-	 */
-	public function to_json( $posts ) {
-
-		// If there are no events, return empty JSON
-		if ( empty( $posts ) || is_null( $posts ) ) {
-			return '';
-		}
-
-		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
-
-		// The number of words for the excerpt (by default 55, as WordPress).
-		$this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
-
-		// Add a filter to remove the [...] after excerpts, since we're adding
-		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
-
-		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
-		$start_at_slide = 0;
-		$event_index    = - 1;
-		$now            = time();
-
-		// Prepare the timeline variable.
-		$timeline = array();
-
-		// Populate the arrays.
-		$timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
-
-			// Get the start and end dates.
-			// We have to remove double quotes from date to make timeline work properly
-			$start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
-			$end_date   = strtotime( str_replace( '"', '',get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
-
-			// Set the starting slide.
-			$event_index ++;
-			if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
-				$start_at_slide = $event_index;
-			}
-
-			// Load thumbnail
-			$thumbnail_id = get_post_thumbnail_id( $item->ID );
-			if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
-			     && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
-			) {
-
-				// Set the thumbnail URL.
-				if ( 'background' === $display_images_as ) {
-					$date['background'] = array( 'url' => $attachment[0] );
-					$date['media']      = array( 'thumbnail' => $attachment[0] );
-				} else {
-					$date['media'] = array(
-						'url'       => $attachment[0],
-						'thumbnail' => $attachment[0],
-					);
-				}
-			}
-
-			// Set the start/end dates by converting them to TimelineJS required format.
-			$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-			$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
-
-			setup_postdata( $GLOBALS['post'] = $item );
-
-			$more_link_text = sprintf(
-				'<span aria-label="%1$s">%2$s</span>',
-				sprintf(
-				/* translators: %s: Name of current post */
-					__( 'Continue reading %s' ),
-					the_title_attribute( array( 'echo' => false ) )
-				),
-				__( '(more&hellip;)' )
-			);
-
-			// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
-			$date['text'] = array(
-				'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
-			);
-
-			// If we have an excerpt, set it.
-			if ( 0 < $excerpt_length ) {
-				$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
-			}
-
-			return $date;
-
-		}, $posts );
-
-		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
-
-		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
-		return array(
-			'timeline'       => $timeline,
-			'start_at_slide' => $start_at_slide,
-		);
-	}
-
-	/**
-	 * This function filters {@link excerpt_more} by removing it, since we're
-	 * adding the 'read more' link. This filter is set by {@see to_json}.
-	 *
-	 * @param string $excerpt_more The excerpt more preset.
-	 *
-	 * @return string An empty string.
-	 * @since 3.7.0
-	 *
-	 */
-	public function excerpt_more( $excerpt_more ) {
-
-		return '';
-	}
-
-	/**
-	 * A filter for the excerpt length, set by the `to_json` function, to tailor
-	 * how many words to return according to the client setting.
-	 *
-	 * @param int $length The preset number of words.
-	 *
-	 * @return int The number of words for the preset.
-	 * @since 3.7.0
-	 *
-	 */
-	public function excerpt_length( $length ) {
-
-		return $this->excerpt_length;
-	}
-
-
-	/**
-	 * Convert the date to a date array.
-	 *
-	 * @param $value int A date value.
-	 *
-	 * @return array An array containing year, month and day values.
-	 * @since 3.7.0
-	 *
-	 */
-	public static function date( $value ) {
-
-		return array(
-			'year'  => (int) date( 'Y', $value ),
-			'month' => (int) date( 'm', $value ),
-			'day'   => (int) date( 'd', $value ),
-
-		);
-	}
-
-	/**
-	 * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
-	 * its specific function).
-	 *
-	 * @return array An array of post IDs.
-	 * @since 3.1.0
-	 *
-	 */
-	public function get_all_related_to_last_50_published_posts() {
-
-		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
-			'numberposts' => 50,
-			'fields'      => 'ids', //only get post IDs
-			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
-			'tax_query'   => array(
-				'relation' => 'OR',
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'operator' => 'NOT EXISTS',
-				),
-				array(
-					'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
-					'field'    => 'slug',
-					'terms'    => 'article',
-				),
-			),
-			'post_status' => 'publish',
-		) );
-
-		if ( empty( $latest_posts_ids ) ) {
-			// There are no posts.
-			return array();
-		}
-
-		// Collect entities related to latest posts
-		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
-				'status' => 'publish',
-			) ) );
-		}
-
-		return $entity_ids;
-	}
+    /**
+     * The Log service.
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Log_Service $log The Log service.
+     */
+    private $log;
+
+    /**
+     * The number of words to use for the excerpt, set in the `to_json` function
+     * and used by a filter.
+     *
+     * @since  3.7.0
+     * @access private
+     * @var int $excerpt_length The number of words to use for the excerpt.
+     */
+    private $excerpt_length;
+
+    /**
+     * A singleton instance of the Timeline service (useful for unit tests).
+     *
+     * @since  3.1.0
+     * @access private
+     * @var \Wordlift_Timeline_Service $instance The singleton instance.
+     */
+    private static $instance;
+
+    /**
+     * Create a Wordlift_Timeline_Service instance.
+     *
+     * @since 3.1.0
+     *
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+
+        self::$instance = $this;
+
+    }
+
+    /**
+     * Get the singleton instance of the Wordlift_Timeline_Service
+     *
+     * @return \Wordlift_Timeline_Service The singleton instance of the Wordlift_Timeline_Service.
+     * @since 3.1.0
+     *
+     */
+    public static function get_instance() {
+
+        return self::$instance;
+    }
+
+    /**
+     * Retrieve timeline events and output them in JSON.
+     *
+     * @since 3.1.0
+     */
+    public function ajax_timeline() {
+
+        // Get the ID of the post who requested the timeline.
+        $post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+
+        // Get the events and transform them for the JSON response, then send them to the client.
+        wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+
+    }
+
+    /**
+     * Retrieve timeline events.
+     *
+     * @param int $post_id The post ID.
+     *
+     * @return array An array of event posts.
+     * @since 3.1.0
+     *
+     * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
+     *
+     */
+    public function get_events( $post_id = null ) {
+
+        // Get the entity IDs either from the entities related to the specified post or from the last 50 published
+        // posts if no post has been specified.
+        $ids = ( is_numeric( $post_id )
+            ? wl_core_get_related_entity_ids( $post_id )
+            : $this->get_all_related_to_last_50_published_posts() );
+
+        // Add the post itself if it's an entity.
+        if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+            $ids[] = $post_id;
+        }
+
+        // If there's no entities, return an empty array right away.
+        if ( 0 === sizeof( $ids ) ) {
+            $this->log->trace( "No events found [ post id :: $post_id ]" );
+
+            return array();
+        }
+
+        $this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+
+        $args = array(
+            'post__in'       => $ids,
+            'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
+            'post_status'    => 'publish',
+            'posts_per_page' => - 1,
+            'meta_query'     => array(
+                'relation' => 'AND',
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_START,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+                array(
+                    'key'     => Wordlift_Schema_Service::FIELD_DATE_END,
+                    'value'   => null,
+                    'compare' => '!=',
+                ),
+            ),
+            'tax_query'      => array(
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'event',
+                ),
+            ),
+            'orderby'        => 'meta_value',
+            'order'          => 'DESC',
+            'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
+        );
+
+        return get_posts( $args );
+    }
+
+    /**
+     * Convert timeline events to JSON. This function sets the global post in order
+     * to get an automatic excerpt. Since we're being called inside an AJAX request,
+     * we're not taking care of restoring any previous post: there isn't any.
+     *
+     * @param array $posts An array of posts.
+     *
+     * @return array|string An array of timeline events or an empty string if no posts are provided.
+     * @since 3.1.0
+     *
+     */
+    public function to_json( $posts ) {
+
+        // If there are no events, return empty JSON
+        if ( empty( $posts ) || is_null( $posts ) ) {
+            return '';
+        }
+
+        // {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
+        $display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
+
+        // The number of words for the excerpt (by default 55, as WordPress).
+        $this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
+        add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+
+        // Add a filter to remove the [...] after excerpts, since we're adding
+        // a link to the post itself.
+        add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
+
+        // Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
+        $start_at_slide = 0;
+        $event_index    = - 1;
+        $now            = time();
+
+        // Prepare the timeline variable.
+        $timeline = array();
+
+        // Populate the arrays.
+        $timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+
+            // Get the start and end dates.
+            // We have to remove double quotes from date to make timeline work properly
+            $start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
+            $end_date   = strtotime( str_replace( '"', '',get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
+
+            // Set the starting slide.
+            $event_index ++;
+            if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+                $start_at_slide = $event_index;
+            }
+
+            // Load thumbnail
+            $thumbnail_id = get_post_thumbnail_id( $item->ID );
+            if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
+                 && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+            ) {
+
+                // Set the thumbnail URL.
+                if ( 'background' === $display_images_as ) {
+                    $date['background'] = array( 'url' => $attachment[0] );
+                    $date['media']      = array( 'thumbnail' => $attachment[0] );
+                } else {
+                    $date['media'] = array(
+                        'url'       => $attachment[0],
+                        'thumbnail' => $attachment[0],
+                    );
+                }
+            }
+
+            // Set the start/end dates by converting them to TimelineJS required format.
+            $date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
+            $date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+
+            setup_postdata( $GLOBALS['post'] = $item );
+
+            $more_link_text = sprintf(
+                '<span aria-label="%1$s">%2$s</span>',
+                sprintf(
+                /* translators: %s: Name of current post */
+                    __( 'Continue reading %s' ),
+                    the_title_attribute( array( 'echo' => false ) )
+                ),
+                __( '(more&hellip;)' )
+            );
+
+            // Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
+            $date['text'] = array(
+                'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+            );
+
+            // If we have an excerpt, set it.
+            if ( 0 < $excerpt_length ) {
+                $date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+            }
+
+            return $date;
+
+        }, $posts );
+
+        // Finally remove the excerpt filter.
+        remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+
+        // The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
+        return array(
+            'timeline'       => $timeline,
+            'start_at_slide' => $start_at_slide,
+        );
+    }
+
+    /**
+     * This function filters {@link excerpt_more} by removing it, since we're
+     * adding the 'read more' link. This filter is set by {@see to_json}.
+     *
+     * @param string $excerpt_more The excerpt more preset.
+     *
+     * @return string An empty string.
+     * @since 3.7.0
+     *
+     */
+    public function excerpt_more( $excerpt_more ) {
+
+        return '';
+    }
+
+    /**
+     * A filter for the excerpt length, set by the `to_json` function, to tailor
+     * how many words to return according to the client setting.
+     *
+     * @param int $length The preset number of words.
+     *
+     * @return int The number of words for the preset.
+     * @since 3.7.0
+     *
+     */
+    public function excerpt_length( $length ) {
+
+        return $this->excerpt_length;
+    }
+
+
+    /**
+     * Convert the date to a date array.
+     *
+     * @param $value int A date value.
+     *
+     * @return array An array containing year, month and day values.
+     * @since 3.7.0
+     *
+     */
+    public static function date( $value ) {
+
+        return array(
+            'year'  => (int) date( 'Y', $value ),
+            'month' => (int) date( 'm', $value ),
+            'day'   => (int) date( 'd', $value ),
+
+        );
+    }
+
+    /**
+     * Get the entities related to the last 50 posts published on this blog (we're keeping a long function name due to
+     * its specific function).
+     *
+     * @return array An array of post IDs.
+     * @since 3.1.0
+     *
+     */
+    public function get_all_related_to_last_50_published_posts() {
+
+        // Global timeline. Get entities from the latest posts.
+        $latest_posts_ids = get_posts( array(
+            'numberposts' => 50,
+            'fields'      => 'ids', //only get post IDs
+            'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
+            'tax_query'   => array(
+                'relation' => 'OR',
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'operator' => 'NOT EXISTS',
+                ),
+                array(
+                    'taxonomy' => Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME,
+                    'field'    => 'slug',
+                    'terms'    => 'article',
+                ),
+            ),
+            'post_status' => 'publish',
+        ) );
+
+        if ( empty( $latest_posts_ids ) ) {
+            // There are no posts.
+            return array();
+        }
+
+        // Collect entities related to latest posts
+        $entity_ids = array();
+        foreach ( $latest_posts_ids as $id ) {
+            $entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+                'status' => 'publish',
+            ) ) );
+        }
+
+        return $entity_ids;
+    }
 
 }

Spacing +53 added lines, -53 removed lines

@@ -52,7 +52,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( 'Wordlift_Timeline_Service' );
+		$this->log = Wordlift_Log_Service::get_logger('Wordlift_Timeline_Service');
 
 		self::$instance = $this;
 
@@ -78,10 +78,10 @@ 
 	public function ajax_timeline() {
 
 		// Get the ID of the post who requested the timeline.
-		$post_id = ( isset( $_REQUEST['post_id'] ) ? (int) $_REQUEST['post_id'] : null );
+		$post_id = (isset($_REQUEST['post_id']) ? (int) $_REQUEST['post_id'] : null);
 
 		// Get the events and transform them for the JSON response, then send them to the client.
-		wp_send_json( $this->to_json( $this->get_events( $post_id ) ) );
+		wp_send_json($this->to_json($this->get_events($post_id)));
 
 	}
 
@@ -96,33 +96,33 @@ 
 	 * @uses  wl_core_get_related_entity_ids() to retrieve the entities referenced by the specified post.
 	 *
 	 */
-	public function get_events( $post_id = null ) {
+	public function get_events($post_id = null) {
 
 		// Get the entity IDs either from the entities related to the specified post or from the last 50 published
 		// posts if no post has been specified.
-		$ids = ( is_numeric( $post_id )
-			? wl_core_get_related_entity_ids( $post_id )
-			: $this->get_all_related_to_last_50_published_posts() );
+		$ids = (is_numeric($post_id)
+			? wl_core_get_related_entity_ids($post_id)
+			: $this->get_all_related_to_last_50_published_posts());
 
 		// Add the post itself if it's an entity.
-		if ( is_numeric( $post_id ) && Wordlift_Entity_Service::get_instance()->is_entity( $post_id ) ) {
+		if (is_numeric($post_id) && Wordlift_Entity_Service::get_instance()->is_entity($post_id)) {
 			$ids[] = $post_id;
 		}
 
 		// If there's no entities, return an empty array right away.
-		if ( 0 === sizeof( $ids ) ) {
-			$this->log->trace( "No events found [ post id :: $post_id ]" );
+		if (0 === sizeof($ids)) {
+			$this->log->trace("No events found [ post id :: $post_id ]");
 
 			return array();
 		}
 
-		$this->log->trace( 'Getting events [ entity ids :: ' . join( ', ', $ids ) . ' ]' );
+		$this->log->trace('Getting events [ entity ids :: '.join(', ', $ids).' ]');
 
 		$args = array(
 			'post__in'       => $ids,
 			'post_type'      => Wordlift_Entity_Service::valid_entity_post_types(),
 			'post_status'    => 'publish',
-			'posts_per_page' => - 1,
+			'posts_per_page' => -1,
 			'meta_query'     => array(
 				'relation' => 'AND',
 				array(
@@ -148,7 +148,7 @@ 
 			'meta_key'       => Wordlift_Schema_Service::FIELD_DATE_START,
 		);
 
-		return get_posts( $args );
+		return get_posts($args);
 	}
 
 	/**
@@ -162,23 +162,23 @@ 
 	 * @since 3.1.0
 	 *
 	 */
-	public function to_json( $posts ) {
+	public function to_json($posts) {
 
 		// If there are no events, return empty JSON
-		if ( empty( $posts ) || is_null( $posts ) ) {
+		if (empty($posts) || is_null($posts)) {
 			return '';
 		}
 
 		// {media|thumbnail}: if set to 'media' the image is attached to the slide, if set to 'background' the image is set as background.
-		$display_images_as = isset( $_REQUEST['display_images_as'] ) ? (string) $_REQUEST['display_images_as'] : 'media';
+		$display_images_as = isset($_REQUEST['display_images_as']) ? (string) $_REQUEST['display_images_as'] : 'media';
 
 		// The number of words for the excerpt (by default 55, as WordPress).
-		$this->excerpt_length = $excerpt_length = isset( $_REQUEST['excerpt_length'] ) && is_numeric( $_REQUEST['excerpt_length'] ) ? $_REQUEST['excerpt_length'] : 55;
-		add_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		$this->excerpt_length = $excerpt_length = isset($_REQUEST['excerpt_length']) && is_numeric($_REQUEST['excerpt_length']) ? $_REQUEST['excerpt_length'] : 55;
+		add_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// Add a filter to remove the [...] after excerpts, since we're adding
 		// a link to the post itself.
-		add_filter( 'excerpt_more', array( $this, 'excerpt_more' ) );
+		add_filter('excerpt_more', array($this, 'excerpt_more'));
 
 		// Prepare for the starting slide data. The starting slide will be the one where *now* is between *start/end* dates.
 		$start_at_slide = 0;
@@ -189,29 +189,29 @@ 
 		$timeline = array();
 
 		// Populate the arrays.
-		$timeline['events'] = array_map( function ( $item ) use ( &$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length ) {
+		$timeline['events'] = array_map(function($item) use (&$timeline, &$event_index, &$start_at_slide, &$now, $display_images_as, $excerpt_length) {
 
 			// Get the start and end dates.
 			// We have to remove double quotes from date to make timeline work properly
-			$start_date = strtotime( str_replace( '"', '', get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true ) ) );
-			$end_date   = strtotime( str_replace( '"', '',get_post_meta( $item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true ) ) );
+			$start_date = strtotime(str_replace('"', '', get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_START, true)));
+			$end_date   = strtotime(str_replace('"', '', get_post_meta($item->ID, Wordlift_Schema_Service::FIELD_DATE_END, true)));
 
 			// Set the starting slide.
-			$event_index ++;
-			if ( 0 === $start_at_slide && $now >= $start_date && $now <= $end_date ) {
+			$event_index++;
+			if (0 === $start_at_slide && $now >= $start_date && $now <= $end_date) {
 				$start_at_slide = $event_index;
 			}
 
 			// Load thumbnail
-			$thumbnail_id = get_post_thumbnail_id( $item->ID );
-			if ( '' !== $thumbnail_id && 0 !== $thumbnail_id
-			     && false !== ( $attachment = wp_get_attachment_image_src( $thumbnail_id ) )
+			$thumbnail_id = get_post_thumbnail_id($item->ID);
+			if ('' !== $thumbnail_id && 0 !== $thumbnail_id
+			     && false !== ($attachment = wp_get_attachment_image_src($thumbnail_id))
 			) {
 
 				// Set the thumbnail URL.
-				if ( 'background' === $display_images_as ) {
-					$date['background'] = array( 'url' => $attachment[0] );
-					$date['media']      = array( 'thumbnail' => $attachment[0] );
+				if ('background' === $display_images_as) {
+					$date['background'] = array('url' => $attachment[0]);
+					$date['media']      = array('thumbnail' => $attachment[0]);
 				} else {
 					$date['media'] = array(
 						'url'       => $attachment[0],
@@ -221,37 +221,37 @@ 
 			}
 
 			// Set the start/end dates by converting them to TimelineJS required format.
-			$date['start_date'] = Wordlift_Timeline_Service::date( $start_date );
-			$date['end_date']   = Wordlift_Timeline_Service::date( $end_date );
+			$date['start_date'] = Wordlift_Timeline_Service::date($start_date);
+			$date['end_date']   = Wordlift_Timeline_Service::date($end_date);
 
-			setup_postdata( $GLOBALS['post'] = $item );
+			setup_postdata($GLOBALS['post'] = $item);
 
 			$more_link_text = sprintf(
 				'<span aria-label="%1$s">%2$s</span>',
 				sprintf(
 				/* translators: %s: Name of current post */
-					__( 'Continue reading %s' ),
-					the_title_attribute( array( 'echo' => false ) )
+					__('Continue reading %s'),
+					the_title_attribute(array('echo' => false))
 				),
-				__( '(more&hellip;)' )
+				__('(more&hellip;)')
 			);
 
 			// Set the event text only with the headline (see https://github.com/insideout10/wordlift-plugin/issues/352).
 			$date['text'] = array(
-				'headline' => '<a href="' . get_permalink( $item->ID ) . '">' . $item->post_title . '</a>',
+				'headline' => '<a href="'.get_permalink($item->ID).'">'.$item->post_title.'</a>',
 			);
 
 			// If we have an excerpt, set it.
-			if ( 0 < $excerpt_length ) {
-				$date['text']['text'] = sprintf( '%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text );
+			if (0 < $excerpt_length) {
+				$date['text']['text'] = sprintf('%s <a href="%s">%s</a>', get_the_excerpt(), get_permalink(), $more_link_text);
 			}
 
 			return $date;
 
-		}, $posts );
+		}, $posts);
 
 		// Finally remove the excerpt filter.
-		remove_filter( 'excerpt_length', array( $this, 'excerpt_length' ) );
+		remove_filter('excerpt_length', array($this, 'excerpt_length'));
 
 		// The JSON format is defined here: https://timeline.knightlab.com/docs/json-format.html
 		return array(
@@ -270,7 +270,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_more( $excerpt_more ) {
+	public function excerpt_more($excerpt_more) {
 
 		return '';
 	}
@@ -285,7 +285,7 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public function excerpt_length( $length ) {
+	public function excerpt_length($length) {
 
 		return $this->excerpt_length;
 	}
@@ -300,12 +300,12 @@ 
 	 * @since 3.7.0
 	 *
 	 */
-	public static function date( $value ) {
+	public static function date($value) {
 
 		return array(
-			'year'  => (int) date( 'Y', $value ),
-			'month' => (int) date( 'm', $value ),
-			'day'   => (int) date( 'd', $value ),
+			'year'  => (int) date('Y', $value),
+			'month' => (int) date('m', $value),
+			'day'   => (int) date('d', $value),
 
 		);
 	}
@@ -321,7 +321,7 @@ 
 	public function get_all_related_to_last_50_published_posts() {
 
 		// Global timeline. Get entities from the latest posts.
-		$latest_posts_ids = get_posts( array(
+		$latest_posts_ids = get_posts(array(
 			'numberposts' => 50,
 			'fields'      => 'ids', //only get post IDs
 			'post_type'   => Wordlift_Entity_Service::valid_entity_post_types(),
@@ -338,19 +338,19 @@ 
 				),
 			),
 			'post_status' => 'publish',
-		) );
+		));
 
-		if ( empty( $latest_posts_ids ) ) {
+		if (empty($latest_posts_ids)) {
 			// There are no posts.
 			return array();
 		}
 
 		// Collect entities related to latest posts
 		$entity_ids = array();
-		foreach ( $latest_posts_ids as $id ) {
-			$entity_ids = array_merge( $entity_ids, wl_core_get_related_entity_ids( $id, array(
+		foreach ($latest_posts_ids as $id) {
+			$entity_ids = array_merge($entity_ids, wl_core_get_related_entity_ids($id, array(
 				'status' => 'publish',
-			) ) );
+			)));
 		}
 
 		return $entity_ids;

src/deprecations.php

Spacing +69 added lines, -69 removed lines

@@ -16,9 +16,9 @@ 
  * @deprecated use Wordlift_Log_Service::get_instance()->info( $log );
  *
  */
-function wl_write_log( $log ) {
+function wl_write_log($log) {
 
-	Wordlift_Log_Service::get_instance()->debug( $log );
+	Wordlift_Log_Service::get_instance()->debug($log);
 
 }
 
@@ -29,7 +29,7 @@ 
 function wordlift_allowed_post_tags() {
 	global $allowedposttags;
 
-	$tags           = array( 'span' );
+	$tags           = array('span');
 	$new_attributes = array(
 		'itemscope' => array(),
 		'itemtype'  => array(),
@@ -37,15 +37,15 @@ 
 		'itemid'    => array(),
 	);
 
-	foreach ( $tags as $tag ) {
-		if ( isset( $allowedposttags[ $tag ] ) && is_array( $allowedposttags[ $tag ] ) ) {
-			$allowedposttags[ $tag ] = array_merge( $allowedposttags[ $tag ], $new_attributes );
+	foreach ($tags as $tag) {
+		if (isset($allowedposttags[$tag]) && is_array($allowedposttags[$tag])) {
+			$allowedposttags[$tag] = array_merge($allowedposttags[$tag], $new_attributes);
 		}
 	}
 }
 
 // add allowed post tags.
-add_action( 'init', 'wordlift_allowed_post_tags' );
+add_action('init', 'wordlift_allowed_post_tags');
 
 /**
  * Register additional scripts for the admin UI.
@@ -53,21 +53,21 @@ 
 function wordlift_admin_enqueue_scripts() {
 
 	// Added for compatibility with WordPress 3.9 (see http://make.wordpress.org/core/2014/04/16/jquery-ui-and-wpdialogs-in-wordpress-3-9/)
-	wp_enqueue_script( 'wpdialogs' );
-	wp_enqueue_style( 'wp-jquery-ui-dialog' );
+	wp_enqueue_script('wpdialogs');
+	wp_enqueue_style('wp-jquery-ui-dialog');
 
-	wp_enqueue_style( 'wordlift-reloaded', plugin_dir_url( __FILE__ ) . 'css/wordlift-reloaded.min.css' );
+	wp_enqueue_style('wordlift-reloaded', plugin_dir_url(__FILE__).'css/wordlift-reloaded.min.css');
 
-	wp_enqueue_script( 'jquery-ui-autocomplete' );
+	wp_enqueue_script('jquery-ui-autocomplete');
 
 	// Disable auto-save for custom entity posts only
-	if ( Wordlift_Entity_Service::TYPE_NAME === get_post_type() ) {
-		wp_dequeue_script( 'autosave' );
+	if (Wordlift_Entity_Service::TYPE_NAME === get_post_type()) {
+		wp_dequeue_script('autosave');
 	}
 
 }
 
-add_action( 'admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts' );
+add_action('admin_enqueue_scripts', 'wordlift_admin_enqueue_scripts');
 
 /**
  * Hooked to *wp_kses_allowed_html* filter, adds microdata attributes.
@@ -77,23 +77,23 @@ 
  *
  * @return array An array which contains allowed microdata attributes.
  */
-function wordlift_allowed_html( $allowedtags, $context ) {
+function wordlift_allowed_html($allowedtags, $context) {
 
-	if ( 'post' !== $context ) {
+	if ('post' !== $context) {
 		return $allowedtags;
 	}
 
-	return array_merge_recursive( $allowedtags, array(
+	return array_merge_recursive($allowedtags, array(
 		'span' => array(
 			'itemscope' => true,
 			'itemtype'  => true,
 			'itemid'    => true,
 			'itemprop'  => true,
 		),
-	) );
+	));
 }
 
-add_filter( 'wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2 );
+add_filter('wp_kses_allowed_html', 'wordlift_allowed_html', 10, 2);
 
 /**
  * Get all the images bound to a post.
@@ -104,11 +104,11 @@ 
  * @deprecated use Wordlift_Storage_Factory::get_instance()->post_images()->get( $post_id )
  *
  */
-function wl_get_image_urls( $post_id ) {
+function wl_get_image_urls($post_id) {
 
 	return Wordlift_Storage_Factory::get_instance()
 	                               ->post_images()
-	                               ->get( $post_id );
+	                               ->get($post_id);
 
 }
 
@@ -120,21 +120,21 @@ 
  *
  * @return WP_Post|null A post instance or null if not found.
  */
-function wl_get_attachment_for_source_url( $parent_post_id, $source_url ) {
+function wl_get_attachment_for_source_url($parent_post_id, $source_url) {
 
 	// wl_write_log( "wl_get_attachment_for_source_url [ parent post id :: $parent_post_id ][ source url :: $source_url ]" );
 
-	$posts = get_posts( array(
+	$posts = get_posts(array(
 		'post_type'      => 'attachment',
 		'posts_per_page' => 1,
 		'post_status'    => 'any',
 		'post_parent'    => $parent_post_id,
 		'meta_key'       => 'wl_source_url',
 		'meta_value'     => $source_url,
-	) );
+	));
 
 	// Return the found post.
-	if ( 1 === count( $posts ) ) {
+	if (1 === count($posts)) {
 		return $posts[0];
 	}
 
@@ -148,10 +148,10 @@ 
  * @param int $post_id The post ID.
  * @param string $source_url The source URL.
  */
-function wl_set_source_url( $post_id, $source_url ) {
+function wl_set_source_url($post_id, $source_url) {
 
-	delete_post_meta( $post_id, 'wl_source_url' );
-	add_post_meta( $post_id, 'wl_source_url', $source_url );
+	delete_post_meta($post_id, 'wl_source_url');
+	add_post_meta($post_id, 'wl_source_url', $source_url);
 }
 
 /**
@@ -166,9 +166,9 @@ 
  * @see        https://codex.wordpress.org/Function_Reference/sanitize_title
  *
  */
-function wl_sanitize_uri_path( $path, $char = '_' ) {
+function wl_sanitize_uri_path($path, $char = '_') {
 
-	return Wordlift_Uri_Service::get_instance()->sanitize_path( $path, $char );
+	return Wordlift_Uri_Service::get_instance()->sanitize_path($path, $char);
 }
 
 /**
@@ -178,95 +178,95 @@ 
  *
  * @return string The updated post content.
  */
-function wl_replace_item_id_with_uri( $content ) {
+function wl_replace_item_id_with_uri($content) {
 
-	$log = Wordlift_Log_Service::get_logger( 'wl_replace_item_id_with_uri' );
-	$log->trace( 'Replacing item IDs with URIs...' );
+	$log = Wordlift_Log_Service::get_logger('wl_replace_item_id_with_uri');
+	$log->trace('Replacing item IDs with URIs...');
 
 	// Strip slashes, see https://core.trac.wordpress.org/ticket/21767
-	$content = stripslashes( $content );
+	$content = stripslashes($content);
 
 	// If any match are found.
 	$matches = array();
-	if ( 0 < preg_match_all( '/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER ) ) {
+	if (0 < preg_match_all('/ itemid="([^"]+)"/i', $content, $matches, PREG_SET_ORDER)) {
 
-		foreach ( $matches as $match ) {
+		foreach ($matches as $match) {
 
 			// Get the item ID.
 			$item_id = $match[1];
 
 			// Get the post bound to that item ID (looking both in the 'official' URI and in the 'same-as' .
 			$post = Wordlift_Entity_Service::get_instance()
-			                               ->get_entity_post_by_uri( $item_id );
+			                               ->get_entity_post_by_uri($item_id);
 
 			// If no entity is found, continue to the next one.
-			if ( null === $post ) {
+			if (null === $post) {
 				continue;
 			}
 
 			// Get the URI for that post.
-			$uri = wl_get_entity_uri( $post->ID );
+			$uri = wl_get_entity_uri($post->ID);
 
 			// wl_write_log( "wl_replace_item_id_with_uri [ item id :: $item_id ][ uri :: $uri ]" );
 
 			// If the item ID and the URI differ, replace the item ID with the URI saved in WordPress.
-			if ( ! empty( $uri ) && $item_id !== $uri ) {
-				$uri_e   = esc_html( $uri );
-				$content = str_replace( " itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content );
+			if ( ! empty($uri) && $item_id !== $uri) {
+				$uri_e   = esc_html($uri);
+				$content = str_replace(" itemid=\"$item_id\"", " itemid=\"$uri_e\"", $content);
 			}
 		}
 	}
 
 	// Reapply slashes.
-	$content = addslashes( $content );
+	$content = addslashes($content);
 
 	return $content;
 }
 
-add_filter( 'content_save_pre', 'wl_replace_item_id_with_uri', 1, 1 );
+add_filter('content_save_pre', 'wl_replace_item_id_with_uri', 1, 1);
 
-require_once( 'wordlift_entity_functions.php' );
+require_once('wordlift_entity_functions.php');
 
 // add editor related methods.
-require_once( 'wordlift_editor.php' );
+require_once('wordlift_editor.php');
 
 // add the WordLift entity custom type.
-require_once( 'wordlift_entity_type.php' );
+require_once('wordlift_entity_type.php');
 
-require_once( 'modules/common/load.php' );
-require_once( 'modules/configuration/wordlift_configuration_settings.php' );
+require_once('modules/common/load.php');
+require_once('modules/configuration/wordlift_configuration_settings.php');
 
 // Load modules
-require_once( 'modules/analyzer/wordlift_analyzer.php' );
-require_once( 'modules/linked_data/wordlift_linked_data.php' );
-require_once( 'modules/acf4so/load.php' );
+require_once('modules/analyzer/wordlift_analyzer.php');
+require_once('modules/linked_data/wordlift_linked_data.php');
+require_once('modules/acf4so/load.php');
 
 // Shortcodes
-require_once( 'shortcodes/class-wordlift-shortcode-rest.php' );
-require_once( 'shortcodes/wordlift_shortcode_chord.php' );
-require_once( 'shortcodes/wordlift_shortcode_geomap.php' );
-require_once( 'shortcodes/wordlift_shortcode_field.php' );
-require_once( 'shortcodes/wordlift_shortcode_faceted_search.php' );
-require_once( 'shortcodes/wordlift_shortcode_navigator.php' );
-require_once( 'shortcodes/class-wordlift-products-navigator-shortcode-rest.php' );
-
-require_once( 'widgets/wordlift_widget_geo.php' );
-require_once( 'widgets/class-wordlift-chord-widget.php' );
-require_once( 'widgets/wordlift_widget_timeline.php' );
+require_once('shortcodes/class-wordlift-shortcode-rest.php');
+require_once('shortcodes/wordlift_shortcode_chord.php');
+require_once('shortcodes/wordlift_shortcode_geomap.php');
+require_once('shortcodes/wordlift_shortcode_field.php');
+require_once('shortcodes/wordlift_shortcode_faceted_search.php');
+require_once('shortcodes/wordlift_shortcode_navigator.php');
+require_once('shortcodes/class-wordlift-products-navigator-shortcode-rest.php');
+
+require_once('widgets/wordlift_widget_geo.php');
+require_once('widgets/class-wordlift-chord-widget.php');
+require_once('widgets/wordlift_widget_timeline.php');
 
 // Add admin functions.
 // TODO: find a way to make 'admin' UI tests work.
 //if ( is_admin() ) {
 
-require_once( 'admin/wordlift_admin.php' );
-require_once( 'admin/wordlift_admin_edit_post.php' );
-require_once( 'admin/wordlift_admin_save_post.php' );
+require_once('admin/wordlift_admin.php');
+require_once('admin/wordlift_admin_edit_post.php');
+require_once('admin/wordlift_admin_save_post.php');
 
 // add the entities meta box.
-require_once( 'admin/wordlift_admin_meta_box_entities.php' );
+require_once('admin/wordlift_admin_meta_box_entities.php');
 
 // add the entity creation AJAX.
-require_once( 'admin/wordlift_admin_ajax_related_posts.php' );
+require_once('admin/wordlift_admin_ajax_related_posts.php');
 
 // Load the wl_chord TinyMCE button and configuration dialog.
-require_once( 'admin/wordlift_admin_shortcodes.php' );
+require_once('admin/wordlift_admin_shortcodes.php');

src/wordlift/admin/class-key-validation-notice.php

Indentation +85 added lines, -85 removed lines

@@ -11,58 +11,58 @@ 
  */
 class Key_Validation_Notice {
 
-	const CACHE_KEY = 'is_key_valid';
+    const CACHE_KEY = 'is_key_valid';
 
-	const KEY_VALIDATION_NONCE_ACTION = 'wl_key_validation_notice_nonce';
+    const KEY_VALIDATION_NONCE_ACTION = 'wl_key_validation_notice_nonce';
 
-	const KEY_VALIDATION_NONCE_PARAM = '_wl_key_validation_notice_nonce';
+    const KEY_VALIDATION_NONCE_PARAM = '_wl_key_validation_notice_nonce';
 
-	const KEY_VALIDATION_NOTICE_PARAM = 'wl_key_validation_notice';
+    const KEY_VALIDATION_NOTICE_PARAM = 'wl_key_validation_notice';
 
-	const NOTIFICATION_OPTION_KEY = 'wordlift_key_validation_notification_shown';
+    const NOTIFICATION_OPTION_KEY = 'wordlift_key_validation_notification_shown';
 
-	/**
-	 * @var \Wordlift_Key_Validation_Service
-	 */
-	private $key_validation_service;
+    /**
+     * @var \Wordlift_Key_Validation_Service
+     */
+    private $key_validation_service;
 
-	/**
-	 * @var Ttl_Cache
-	 */
-	private $ttl_cache_service;
+    /**
+     * @var Ttl_Cache
+     */
+    private $ttl_cache_service;
 
-	/**
-	 * @var Wordlift_Configuration_Service
-	 */
-	private $configuration_service;
+    /**
+     * @var Wordlift_Configuration_Service
+     */
+    private $configuration_service;
 
-	/**
-	 * Key_Validation_Notice constructor.
-	 *
-	 * @param \Wordlift_Key_Validation_Service $key_validation_service
-	 * @param Wordlift_Configuration_Service $configuration_service
-	 */
-	public function __construct( $key_validation_service, $configuration_service ) {
+    /**
+     * Key_Validation_Notice constructor.
+     *
+     * @param \Wordlift_Key_Validation_Service $key_validation_service
+     * @param Wordlift_Configuration_Service $configuration_service
+     */
+    public function __construct( $key_validation_service, $configuration_service ) {
 
-		$this->key_validation_service = $key_validation_service;
-		$this->configuration_service  = $configuration_service;
+        $this->key_validation_service = $key_validation_service;
+        $this->configuration_service  = $configuration_service;
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
+        $this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
 
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			$this->display_key_validation_notice();
-		}
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            $this->display_key_validation_notice();
+        }
 
-		$that = $this;
-		add_action( 'plugins_loaded', function () use ( $that ) {
-			$that->notification_close_handler();
-		} );
-	}
+        $that = $this;
+        add_action( 'plugins_loaded', function () use ( $that ) {
+            $that->notification_close_handler();
+        } );
+    }
 
 
-	public function show_notification() {
-		$settings_url = admin_url( 'admin.php?page=wl_configuration_admin_menu' );
-		?>
+    public function show_notification() {
+        $settings_url = admin_url( 'admin.php?page=wl_configuration_admin_menu' );
+        ?>
         <div class="wl-notice notice is-dismissible error">
             <p>
 				<?php echo wp_kses( __( "Your WordLift key is not valid, please update the key in <a href='$settings_url'>WordLift Settings</a> or contact our support at hello@wordlift.io.", 'wordlift' ), array( 'a' => array( 'href' ) ) ); ?>
@@ -71,70 +71,70 @@ 
             </button>
         </div>
 		<?php
-	}
+    }
 
-	private function is_key_valid() {
+    private function is_key_valid() {
 
-		$key = $this->configuration_service->get_key();
+        $key = $this->configuration_service->get_key();
 
-		// Check cache if the result is present, if not get the results
-		// save it and return the data.
-		if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
-			return $this->ttl_cache_service->get( self::CACHE_KEY );
-		}
+        // Check cache if the result is present, if not get the results
+        // save it and return the data.
+        if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
+            return $this->ttl_cache_service->get( self::CACHE_KEY );
+        }
 
-		$is_valid = $this->key_validation_service->is_key_valid( $key );
+        $is_valid = $this->key_validation_service->is_key_valid( $key );
 
-		// when the cache is set, clear the notification flag.
-		delete_option( self::NOTIFICATION_OPTION_KEY );
+        // when the cache is set, clear the notification flag.
+        delete_option( self::NOTIFICATION_OPTION_KEY );
 
-		$this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
+        $this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
 
-		return $is_valid;
-	}
+        return $is_valid;
+    }
 
-	private function display_key_validation_notice() {
-		$that = $this;
-		add_action( 'admin_notices', function () use ( $that ) {
+    private function display_key_validation_notice() {
+        $that = $this;
+        add_action( 'admin_notices', function () use ( $that ) {
 
-			$is_notification_shown = get_option( Key_Validation_Notice::NOTIFICATION_OPTION_KEY, false );
+            $is_notification_shown = get_option( Key_Validation_Notice::NOTIFICATION_OPTION_KEY, false );
 
-			$key = $that->configuration_service->get_key();
+            $key = $that->configuration_service->get_key();
 
-			if ( ! $key ) {
-				// Dont show warning or make API call, return early.
-				return;
-			}
+            if ( ! $key ) {
+                // Dont show warning or make API call, return early.
+                return;
+            }
 
-			if ( $that->is_key_valid() ) {
-				return;
-			}
+            if ( $that->is_key_valid() ) {
+                return;
+            }
 
-			if ( $is_notification_shown ) {
-				return;
-			}
+            if ( $is_notification_shown ) {
+                return;
+            }
 
-			$that->show_notification();
+            $that->show_notification();
 
-		} );
-	}
+        } );
+    }
 
-	public function notification_close_handler() {
-		if ( ! isset( $_GET['wl_key_validation_notice'] )
-		     || ! isset( $_GET['_wl_key_validation_notice_nonce'] ) ) {
-			return false;
-		}
-		$nonce = sanitize_text_field( wp_unslash( (string) $_GET['_wl_key_validation_notice_nonce'] ) );
-		if ( wp_verify_nonce( $nonce, self::KEY_VALIDATION_NONCE_ACTION )
-		     && current_user_can( 'manage_options' ) ) {
-			// close the notification.
-			update_option( self::NOTIFICATION_OPTION_KEY, true );
-		}
-	}
+    public function notification_close_handler() {
+        if ( ! isset( $_GET['wl_key_validation_notice'] )
+             || ! isset( $_GET['_wl_key_validation_notice_nonce'] ) ) {
+            return false;
+        }
+        $nonce = sanitize_text_field( wp_unslash( (string) $_GET['_wl_key_validation_notice_nonce'] ) );
+        if ( wp_verify_nonce( $nonce, self::KEY_VALIDATION_NONCE_ACTION )
+             && current_user_can( 'manage_options' ) ) {
+            // close the notification.
+            update_option( self::NOTIFICATION_OPTION_KEY, true );
+        }
+    }
 
-	public static function remove_notification_flag() {
-		delete_option( self::NOTIFICATION_OPTION_KEY );
-	}
+    public static function remove_notification_flag() {
+        delete_option( self::NOTIFICATION_OPTION_KEY );
+    }
 
 }
 

Spacing +23 added lines, -23 removed lines

@@ -42,30 +42,30 @@ 
 	 * @param \Wordlift_Key_Validation_Service $key_validation_service
 	 * @param Wordlift_Configuration_Service $configuration_service
 	 */
-	public function __construct( $key_validation_service, $configuration_service ) {
+	public function __construct($key_validation_service, $configuration_service) {
 
 		$this->key_validation_service = $key_validation_service;
 		$this->configuration_service  = $configuration_service;
 
-		$this->ttl_cache_service = new Ttl_Cache( 'key-validation-notification', 60 * 60 * 8 );
+		$this->ttl_cache_service = new Ttl_Cache('key-validation-notification', 60 * 60 * 8);
 
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+		if (apply_filters('wl_feature__enable__notices', true)) {
 			$this->display_key_validation_notice();
 		}
 
 		$that = $this;
-		add_action( 'plugins_loaded', function () use ( $that ) {
+		add_action('plugins_loaded', function() use ($that) {
 			$that->notification_close_handler();
 		} );
 	}
 
 
 	public function show_notification() {
-		$settings_url = admin_url( 'admin.php?page=wl_configuration_admin_menu' );
+		$settings_url = admin_url('admin.php?page=wl_configuration_admin_menu');
 		?>
         <div class="wl-notice notice is-dismissible error">
             <p>
-				<?php echo wp_kses( __( "Your WordLift key is not valid, please update the key in <a href='$settings_url'>WordLift Settings</a> or contact our support at hello@wordlift.io.", 'wordlift' ), array( 'a' => array( 'href' ) ) ); ?>
+				<?php echo wp_kses(__("Your WordLift key is not valid, please update the key in <a href='$settings_url'>WordLift Settings</a> or contact our support at hello@wordlift.io.", 'wordlift'), array('a' => array('href'))); ?>
             </p>
             <button type="button" class="notice-dismiss"><span class="screen-reader-text">Dismiss this notice.</span>
             </button>
@@ -79,38 +79,38 @@ 
 
 		// Check cache if the result is present, if not get the results
 		// save it and return the data.
-		if ( $this->ttl_cache_service->get( self::CACHE_KEY ) !== null ) {
-			return $this->ttl_cache_service->get( self::CACHE_KEY );
+		if ($this->ttl_cache_service->get(self::CACHE_KEY) !== null) {
+			return $this->ttl_cache_service->get(self::CACHE_KEY);
 		}
 
-		$is_valid = $this->key_validation_service->is_key_valid( $key );
+		$is_valid = $this->key_validation_service->is_key_valid($key);
 
 		// when the cache is set, clear the notification flag.
-		delete_option( self::NOTIFICATION_OPTION_KEY );
+		delete_option(self::NOTIFICATION_OPTION_KEY);
 
-		$this->ttl_cache_service->put( self::CACHE_KEY, $is_valid );
+		$this->ttl_cache_service->put(self::CACHE_KEY, $is_valid);
 
 		return $is_valid;
 	}
 
 	private function display_key_validation_notice() {
 		$that = $this;
-		add_action( 'admin_notices', function () use ( $that ) {
+		add_action('admin_notices', function() use ($that) {
 
-			$is_notification_shown = get_option( Key_Validation_Notice::NOTIFICATION_OPTION_KEY, false );
+			$is_notification_shown = get_option(Key_Validation_Notice::NOTIFICATION_OPTION_KEY, false);
 
 			$key = $that->configuration_service->get_key();
 
-			if ( ! $key ) {
+			if ( ! $key) {
 				// Dont show warning or make API call, return early.
 				return;
 			}
 
-			if ( $that->is_key_valid() ) {
+			if ($that->is_key_valid()) {
 				return;
 			}
 
-			if ( $is_notification_shown ) {
+			if ($is_notification_shown) {
 				return;
 			}
 
@@ -120,20 +120,20 @@ 
 	}
 
 	public function notification_close_handler() {
-		if ( ! isset( $_GET['wl_key_validation_notice'] )
-		     || ! isset( $_GET['_wl_key_validation_notice_nonce'] ) ) {
+		if ( ! isset($_GET['wl_key_validation_notice'])
+		     || ! isset($_GET['_wl_key_validation_notice_nonce'])) {
 			return false;
 		}
-		$nonce = sanitize_text_field( wp_unslash( (string) $_GET['_wl_key_validation_notice_nonce'] ) );
-		if ( wp_verify_nonce( $nonce, self::KEY_VALIDATION_NONCE_ACTION )
-		     && current_user_can( 'manage_options' ) ) {
+		$nonce = sanitize_text_field(wp_unslash((string) $_GET['_wl_key_validation_notice_nonce']));
+		if (wp_verify_nonce($nonce, self::KEY_VALIDATION_NONCE_ACTION)
+		     && current_user_can('manage_options')) {
 			// close the notification.
-			update_option( self::NOTIFICATION_OPTION_KEY, true );
+			update_option(self::NOTIFICATION_OPTION_KEY, true);
 		}
 	}
 
 	public static function remove_notification_flag() {
-		delete_option( self::NOTIFICATION_OPTION_KEY );
+		delete_option(self::NOTIFICATION_OPTION_KEY);
 	}
 
 }

src/wordlift/admin/class-admin-user-option.php

Indentation +50 added lines, -50 removed lines

@@ -7,55 +7,55 @@
  */
 class Admin_User_Option {
 
-	const WORDLIFT_ADMIN = 'wl_is_wordlift_admin';
-
-	public static function is_wordlift_admin() {
-		return intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
-	}
-
-	public function connect_hook() {
-		add_action( 'wordlift_user_settings_page', array( $this, 'render_checkbox' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'save_checkbox' ) );
-		add_action( 'personal_options_update', array( $this, 'save_checkbox' ) );
-	}
-
-	public function save_checkbox() {
-
-		if ( ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
-
-		if ( ! isset( $_POST[ self::WORDLIFT_ADMIN ] ) ) {
-			delete_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN );
-
-			return;
-		}
-		update_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, 1 );
-	}
-
-	public function render_checkbox() {
-		if ( ! current_user_can( 'manage_options' ) ) {
-			return;
-		}
-		$is_checked   = intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
-		$allowed_html = array(
-			'tr'    => array(),
-			'th'    => array(),
-			'td'    => array(),
-			'input' => array(
-				'type'    => array(),
-				'name'    => array(),
-				'checked' => array(),
-			)
-		);
-		echo wp_kses( $this->get_checkbox( $is_checked ), $allowed_html );
-	}
-
-	public static function get_checkbox( $is_checked ) {
-		$checked    = $is_checked ? "checked='checked'" : '';
-		$admin_text = __( 'Wordlift Admin', 'wordlift' );
-
-		return "<tr><th>$admin_text</th><td><input type='checkbox' name='wl_is_wordlift_admin' $checked></td></tr>";
-	}
+    const WORDLIFT_ADMIN = 'wl_is_wordlift_admin';
+
+    public static function is_wordlift_admin() {
+        return intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
+    }
+
+    public function connect_hook() {
+        add_action( 'wordlift_user_settings_page', array( $this, 'render_checkbox' ) );
+        add_action( 'edit_user_profile_update', array( $this, 'save_checkbox' ) );
+        add_action( 'personal_options_update', array( $this, 'save_checkbox' ) );
+    }
+
+    public function save_checkbox() {
+
+        if ( ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
+
+        if ( ! isset( $_POST[ self::WORDLIFT_ADMIN ] ) ) {
+            delete_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN );
+
+            return;
+        }
+        update_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, 1 );
+    }
+
+    public function render_checkbox() {
+        if ( ! current_user_can( 'manage_options' ) ) {
+            return;
+        }
+        $is_checked   = intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
+        $allowed_html = array(
+            'tr'    => array(),
+            'th'    => array(),
+            'td'    => array(),
+            'input' => array(
+                'type'    => array(),
+                'name'    => array(),
+                'checked' => array(),
+            )
+        );
+        echo wp_kses( $this->get_checkbox( $is_checked ), $allowed_html );
+    }
+
+    public static function get_checkbox( $is_checked ) {
+        $checked    = $is_checked ? "checked='checked'" : '';
+        $admin_text = __( 'Wordlift Admin', 'wordlift' );
+
+        return "<tr><th>$admin_text</th><td><input type='checkbox' name='wl_is_wordlift_admin' $checked></td></tr>";
+    }
 
 }
\ No newline at end of file

Spacing +13 added lines, -13 removed lines

@@ -10,34 +10,34 @@ 
 	const WORDLIFT_ADMIN = 'wl_is_wordlift_admin';
 
 	public static function is_wordlift_admin() {
-		return intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
+		return intval(get_user_meta(get_current_user_id(), self::WORDLIFT_ADMIN, true)) === 1;
 	}
 
 	public function connect_hook() {
-		add_action( 'wordlift_user_settings_page', array( $this, 'render_checkbox' ) );
-		add_action( 'edit_user_profile_update', array( $this, 'save_checkbox' ) );
-		add_action( 'personal_options_update', array( $this, 'save_checkbox' ) );
+		add_action('wordlift_user_settings_page', array($this, 'render_checkbox'));
+		add_action('edit_user_profile_update', array($this, 'save_checkbox'));
+		add_action('personal_options_update', array($this, 'save_checkbox'));
 	}
 
 	public function save_checkbox() {
 
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
 
-		if ( ! isset( $_POST[ self::WORDLIFT_ADMIN ] ) ) {
-			delete_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN );
+		if ( ! isset($_POST[self::WORDLIFT_ADMIN])) {
+			delete_user_meta(get_current_user_id(), self::WORDLIFT_ADMIN);
 
 			return;
 		}
-		update_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, 1 );
+		update_user_meta(get_current_user_id(), self::WORDLIFT_ADMIN, 1);
 	}
 
 	public function render_checkbox() {
-		if ( ! current_user_can( 'manage_options' ) ) {
+		if ( ! current_user_can('manage_options')) {
 			return;
 		}
-		$is_checked   = intval( get_user_meta( get_current_user_id(), self::WORDLIFT_ADMIN, true ) ) === 1;
+		$is_checked   = intval(get_user_meta(get_current_user_id(), self::WORDLIFT_ADMIN, true)) === 1;
 		$allowed_html = array(
 			'tr'    => array(),
 			'th'    => array(),
@@ -48,12 +48,12 @@ 
 				'checked' => array(),
 			)
 		);
-		echo wp_kses( $this->get_checkbox( $is_checked ), $allowed_html );
+		echo wp_kses($this->get_checkbox($is_checked), $allowed_html);
 	}
 
-	public static function get_checkbox( $is_checked ) {
+	public static function get_checkbox($is_checked) {
 		$checked    = $is_checked ? "checked='checked'" : '';
-		$admin_text = __( 'Wordlift Admin', 'wordlift' );
+		$admin_text = __('Wordlift Admin', 'wordlift');
 
 		return "<tr><th>$admin_text</th><td><input type='checkbox' name='wl_is_wordlift_admin' $checked></td></tr>";
 	}

src/wordlift/metabox/class-wl-abstract-metabox.php

Indentation +348 added lines, -348 removed lines

@@ -18,367 +18,367 @@
  * @subpackage Wordlift/admin/WL_Metabox
  */
 class Wl_Abstract_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;
-
-	/**
-	 * A {@link Wordlift_Log_Service} instance.
-	 *
-	 * @since 3.15.4
-	 *
-	 * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
-	 */
-	private $log;
-
-	/**
-	 * WL_Metabox constructor.
-	 *
-	 * @since 3.1.0
-	 */
-	public function __construct() {
-
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
-	}
-
-	/**
-	 * 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() {
-
-		// Build the fields we need to print.
-		$this->instantiate_fields( get_the_ID(), Object_Type_Enum::POST );
-
-		// Bailout if there are no actual fields, we do not need a metabox in that case.
-		if ( empty( $this->fields ) ) {
-			return;
-		}
-
-		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
-
-		// WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
-			add_meta_box( $id, esc_html( $title ), array(
-				$this,
-				'html',
-			), $screen, 'normal', 'high' );
-		}
-
-		// Add filter to change the metabox CSS class.
-		//
-		// @since 3.20.0 Since we support post types other than `entity` for entities, we need to set the `screen`
-		//  dynamically according to the `get_current_screen()` function.
-		$current_screen = get_current_screen();
-		$screen         = $current_screen ? $current_screen->post_type : 'entity';
-		add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
-
-	}
-
-	/**
-	 * Render the metabox html.
-	 *
-	 * @since 3.1.0
-	 *
-	 */
-	public function html() {
-
-		// 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.
-	 *
-	 * @param int $id | $term_id The post id or term id.
-	 *
-	 * @param $type int Post or Term
-	 *
-	 * @since 3.1.0
-	 */
-	public function instantiate_fields( $id, $type ) {
-
-		$this->log->trace( "Instantiating fields for entity 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;
-		}
-		if ( $type === Object_Type_Enum::POST ) {
-			$entity_type = wl_entity_taxonomy_get_custom_fields( $id );
-		} else if ( $type === Object_Type_Enum::TERM ) {
-			$term_entity_types = get_term_meta( $id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$term_entity_types = array_map( function ( $term ) {
-				return get_term_by(
-					'slug',
-					$term,
-					Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
-				);
-			}, $term_entity_types );
-			$entity_type       = wl_get_custom_fields_by_entity_type( $term_entity_types );
-		}
-		if ( isset( $entity_type ) ) {
-
-			/*
+    /**
+     * 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;
+
+    /**
+     * A {@link Wordlift_Log_Service} instance.
+     *
+     * @since 3.15.4
+     *
+     * @var \Wordlift_Log_Service $log A {@link Wordlift_Log_Service} instance.
+     */
+    private $log;
+
+    /**
+     * WL_Metabox constructor.
+     *
+     * @since 3.1.0
+     */
+    public function __construct() {
+
+        $this->log = Wordlift_Log_Service::get_logger( get_class() );
+    }
+
+    /**
+     * 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() {
+
+        // Build the fields we need to print.
+        $this->instantiate_fields( get_the_ID(), Object_Type_Enum::POST );
+
+        // Bailout if there are no actual fields, we do not need a metabox in that case.
+        if ( empty( $this->fields ) ) {
+            return;
+        }
+
+        // Add main metabox (will print also the inner fields).
+        $id    = uniqid( 'wl-metabox-' );
+        $title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+
+        // WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
+        foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
+            add_meta_box( $id, esc_html( $title ), array(
+                $this,
+                'html',
+            ), $screen, 'normal', 'high' );
+        }
+
+        // Add filter to change the metabox CSS class.
+        //
+        // @since 3.20.0 Since we support post types other than `entity` for entities, we need to set the `screen`
+        //  dynamically according to the `get_current_screen()` function.
+        $current_screen = get_current_screen();
+        $screen         = $current_screen ? $current_screen->post_type : 'entity';
+        add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
+
+    }
+
+    /**
+     * Render the metabox html.
+     *
+     * @since 3.1.0
+     *
+     */
+    public function html() {
+
+        // 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.
+     *
+     * @param int $id | $term_id The post id or term id.
+     *
+     * @param $type int Post or Term
+     *
+     * @since 3.1.0
+     */
+    public function instantiate_fields( $id, $type ) {
+
+        $this->log->trace( "Instantiating fields for entity 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;
+        }
+        if ( $type === Object_Type_Enum::POST ) {
+            $entity_type = wl_entity_taxonomy_get_custom_fields( $id );
+        } else if ( $type === Object_Type_Enum::TERM ) {
+            $term_entity_types = get_term_meta( $id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
+            $term_entity_types = array_map( function ( $term ) {
+                return get_term_by(
+                    'slug',
+                    $term,
+                    Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
+                );
+            }, $term_entity_types );
+            $entity_type       = wl_get_custom_fields_by_entity_type( $term_entity_types );
+        }
+        if ( isset( $entity_type ) ) {
+
+            /*
 			 * Might not have any relevant meta box field, for example for articles,
 			 * therefor make sure fields are at least an empty array to help the considered
 			 * in other functions using it.
 			 */
-			$this->fields = array();
+            $this->fields = array();
 
-			/**
-			 * 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, false, $type, $id );
-
-			}
-
-			// Loop over grouped properties.
-			foreach ( $grouped_metaboxes as $key => $property ) {
+            /**
+             * 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];
 
-				// Info passed to the metabox.
-				$info         = array();
-				$info[ $key ] = $property;
+            // Loop over simple entity properties.
+            foreach ( $simple_metaboxes as $key => $property ) {
 
-				// Build the requested field group as WL_Metabox_Field_ object.
-				$this->add_field( $info, true, $type, $id );
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $key ] = $property;
 
-			}
-		}
+                // Build the requested field as WL_Metabox_Field_ object.
+                $this->add_field( $info, false, $type, $id );
 
-	}
+            }
 
-	/**
-	 * 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 ) {
+            // Loop over grouped properties.
+            foreach ( $grouped_metaboxes as $key => $property ) {
 
-		$simple_properties  = array();
-		$grouped_properties = array();
+                // Info passed to the metabox.
+                $info         = array();
+                $info[ $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 if input_field is defined.
-				if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
-
-					$grouped_key = $property['input_field'];
-
-					// Update list of grouped properties.
-					$grouped_properties[ $grouped_key ][ $key ] = $property;
-
-				} else {
-
-					// input_field not defined, add simple metabox.
-					$simple_properties[ $key ] = $property;
-				}
-			}
-		}
-
-		return array( $simple_properties, $grouped_properties );
-	}
-
-	/**
-	 * Add a Field to the current Metabox, based on the description of the Field.
-	 * This method is a rude factory for Field objects.
-	 *
-	 * @param array $args The field's information.
-	 * @param bool $grouped Flag to distinguish between simple and grouped fields.
-	 * @param int $type Post or Term, based on the correct decorator would be selected.
-	 * @param int $id Identifier for the type.
-	 */
-	public function add_field( $args, $grouped, $type, $id ) {
+                // Build the requested field group as WL_Metabox_Field_ object.
+                $this->add_field( $info, true, $type, $id );
 
-		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 );
+    /**
+     * 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();
+
+        // Loop over possible entity properties.
+        foreach ( $custom_fields as $key => $property ) {
+
+            // Check presence of predicate and type.
+            if ( isset( $property['predicate'] ) && isset( $property['type'] ) ) {
+
+                // Check if input_field is defined.
+                if ( isset( $property['input_field'] ) && '' !== $property['input_field'] ) {
+
+                    $grouped_key = $property['input_field'];
+
+                    // Update list of grouped properties.
+                    $grouped_properties[ $grouped_key ][ $key ] = $property;
+
+                } else {
+
+                    // input_field not defined, add simple metabox.
+                    $simple_properties[ $key ] = $property;
+                }
+            }
+        }
+
+        return array( $simple_properties, $grouped_properties );
+    }
+
+    /**
+     * Add a Field to the current Metabox, based on the description of the Field.
+     * This method is a rude factory for Field objects.
+     *
+     * @param array $args The field's information.
+     * @param bool $grouped Flag to distinguish between simple and grouped fields.
+     * @param int $type Post or Term, based on the correct decorator would be selected.
+     * @param int $id Identifier for the type.
+     */
+    public function add_field( $args, $grouped, $type, $id ) {
 
-		} 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 ];
-
-			// If the field declares what metabox it wants, use that one.
-			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'] ) {
-
-				// 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 {
-
-				// 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'];
-
-			}
-
-		}
-		/**
-		 * @since 3.31.6
-		 * Add namespace to initialize class.
-		 */
-		/**
-		 * @since 3.31.6
-		 * Add namespace to initialize class.
-		 */
-		if ( substr( $field_class, 0, 1 ) !== '\\' ) {
-			$field_class = 'Wordlift\Metabox\Field\\' . $field_class;
-			// End if().
-		}
-
-		if ( class_exists( $field_class ) ) {
-			// Get decorator and use it as wrapper for save_data and get_data methods.
-			$instance = new $field_class( $args, $id, $type );
-			// Call apropriate constructor (e.g. Wl_Metabox_Field... ).
-			$this->fields[] = $instance;
-		}
-
-	}
-
-	/**
-	 * Save the form data for the specified entity {@link WP_Post}'s id.
-	 *
-	 * @param int $id The entity's {@link WP_Post}'s id.
-	 *
-	 * @param $type int Post or term
-	 *
-	 * @since 3.5.4
-	 */
-	public function save_form_data( $id, $type ) {
-
-		$this->log->trace( "Saving form data for entity post $id..." );
-
-		// Skip saving if the save is called for a different post.
-		if ( isset( $_POST['post_ID'] ) && (int) $_POST['post_ID'] !== $id  && $type === Object_Type_Enum::POST ) {
-			$this->log->debug( "`wl_metaboxes`, skipping because the post id from request doesnt match the id from filter." );
-			return;
-		}
-
-
-		// Build Field objects.
-		$this->instantiate_fields( $id, $type );
-
-		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			$this->log->debug( "`wl_metaboxes`, skipping..." );
-
-			return;
-		}
-
-		$posted_data = $_POST['wl_metaboxes'];
-
-		foreach ( $this->fields as $field ) {
-
-			// Verify nonce.
-			$valid_nonce = $field->verify_nonce();
-
-			if ( $valid_nonce ) {
-				$field_name = $field->meta_name;
-				// Each Filed only deals with its values.
-				if ( isset( $posted_data[ $field_name ] ) ) {
-
-					$values = $posted_data[ $field_name ];
-					if ( ! is_array( $values ) ) {
-						$values = array( $values );
-					}
-					// Save data permanently
-					$field->save_data( $values );
-				}
-			}
-		}
-
-		/**
-		 * Filter: 'wl_save_form_pre_push_entity' - Allow to hook right
-		 * before the triples are pushed to the linked dataset.
-		 *
-		 * @param int $id The entity id.
-		 * @param int $id The post data.
-		 *
-		 * @since  3.18.2
-		 *
-		 */
-		do_action( 'wl_save_form_pre_push_entity', $id, $_POST );
-
-	}
-
-	/**
-	 * 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( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
-
-		wl_enqueue_leaflet();
-
-		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/admin/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',
-			)
-		);
-
-	}
+        if ( $grouped ) {
+
+            // Special fields (sameas, coordinates, etc.).
+            //
+            // Build Field with a custom class (e.g. WL_Metabox_Field_date).
+            $field_class = 'Wl_Metabox_Field_' . key( $args );
+
+        } else {
+
+            // Simple fields (string, uri, boolean, etc.).
+            //
+            // Which field? We want to use the class that is specific for the field.
+            $meta      = key( $args );
+            $this_meta = $args[ $meta ];
+
+            // If the field declares what metabox it wants, use that one.
+            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'] ) {
+
+                // 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 {
+
+                // 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'];
+
+            }
+
+        }
+        /**
+         * @since 3.31.6
+         * Add namespace to initialize class.
+         */
+        /**
+         * @since 3.31.6
+         * Add namespace to initialize class.
+         */
+        if ( substr( $field_class, 0, 1 ) !== '\\' ) {
+            $field_class = 'Wordlift\Metabox\Field\\' . $field_class;
+            // End if().
+        }
+
+        if ( class_exists( $field_class ) ) {
+            // Get decorator and use it as wrapper for save_data and get_data methods.
+            $instance = new $field_class( $args, $id, $type );
+            // Call apropriate constructor (e.g. Wl_Metabox_Field... ).
+            $this->fields[] = $instance;
+        }
+
+    }
+
+    /**
+     * Save the form data for the specified entity {@link WP_Post}'s id.
+     *
+     * @param int $id The entity's {@link WP_Post}'s id.
+     *
+     * @param $type int Post or term
+     *
+     * @since 3.5.4
+     */
+    public function save_form_data( $id, $type ) {
+
+        $this->log->trace( "Saving form data for entity post $id..." );
+
+        // Skip saving if the save is called for a different post.
+        if ( isset( $_POST['post_ID'] ) && (int) $_POST['post_ID'] !== $id  && $type === Object_Type_Enum::POST ) {
+            $this->log->debug( "`wl_metaboxes`, skipping because the post id from request doesnt match the id from filter." );
+            return;
+        }
+
+
+        // Build Field objects.
+        $this->instantiate_fields( $id, $type );
+
+        // Check if WL metabox form was posted.
+        if ( ! isset( $_POST['wl_metaboxes'] ) ) {
+            $this->log->debug( "`wl_metaboxes`, skipping..." );
+
+            return;
+        }
+
+        $posted_data = $_POST['wl_metaboxes'];
+
+        foreach ( $this->fields as $field ) {
+
+            // Verify nonce.
+            $valid_nonce = $field->verify_nonce();
+
+            if ( $valid_nonce ) {
+                $field_name = $field->meta_name;
+                // Each Filed only deals with its values.
+                if ( isset( $posted_data[ $field_name ] ) ) {
+
+                    $values = $posted_data[ $field_name ];
+                    if ( ! is_array( $values ) ) {
+                        $values = array( $values );
+                    }
+                    // Save data permanently
+                    $field->save_data( $values );
+                }
+            }
+        }
+
+        /**
+         * Filter: 'wl_save_form_pre_push_entity' - Allow to hook right
+         * before the triples are pushed to the linked dataset.
+         *
+         * @param int $id The entity id.
+         * @param int $id The post data.
+         *
+         * @since  3.18.2
+         *
+         */
+        do_action( 'wl_save_form_pre_push_entity', $id, $_POST );
+
+    }
+
+    /**
+     * 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( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
+        wp_enqueue_script( 'wl-flatpickr', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+
+        wl_enqueue_leaflet();
+
+        // Add AJAX autocomplete to facilitate metabox editing.
+        wp_enqueue_script( 'wl-entity-metabox-utility', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/admin/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 +68 added lines, -68 removed lines

@@ -43,7 +43,7 @@ 
 	 */
 	public function __construct() {
 
-		$this->log = Wordlift_Log_Service::get_logger( get_class() );
+		$this->log = Wordlift_Log_Service::get_logger(get_class());
 	}
 
 	/**
@@ -53,23 +53,23 @@ 
 	public function add_main_metabox() {
 
 		// Build the fields we need to print.
-		$this->instantiate_fields( get_the_ID(), Object_Type_Enum::POST );
+		$this->instantiate_fields(get_the_ID(), Object_Type_Enum::POST);
 
 		// Bailout if there are no actual fields, we do not need a metabox in that case.
-		if ( empty( $this->fields ) ) {
+		if (empty($this->fields)) {
 			return;
 		}
 
 		// Add main metabox (will print also the inner fields).
-		$id    = uniqid( 'wl-metabox-' );
-		$title = get_the_title() . ' ' . __( 'properties', 'wordlift' );
+		$id    = uniqid('wl-metabox-');
+		$title = get_the_title().' '.__('properties', 'wordlift');
 
 		// WordPress 4.2 do not accept an array of screens as parameter, have to do be explicit.
-		foreach ( Wordlift_Entity_Service::valid_entity_post_types() as $screen ) {
-			add_meta_box( $id, esc_html( $title ), array(
+		foreach (Wordlift_Entity_Service::valid_entity_post_types() as $screen) {
+			add_meta_box($id, esc_html($title), array(
 				$this,
 				'html',
-			), $screen, 'normal', 'high' );
+			), $screen, 'normal', 'high');
 		}
 
 		// Add filter to change the metabox CSS class.
@@ -78,7 +78,7 @@ 
 		//  dynamically according to the `get_current_screen()` function.
 		$current_screen = get_current_screen();
 		$screen         = $current_screen ? $current_screen->post_type : 'entity';
-		add_filter( "postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class' );
+		add_filter("postbox_classes_{$screen}_$id", 'wl_admin_metaboxes_add_css_class');
 
 	}
 
@@ -91,7 +91,7 @@ 
 	public function html() {
 
 		// 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();
@@ -114,28 +114,28 @@ 
 	 *
 	 * @since 3.1.0
 	 */
-	public function instantiate_fields( $id, $type ) {
+	public function instantiate_fields($id, $type) {
 
-		$this->log->trace( "Instantiating fields for entity post $id..." );
+		$this->log->trace("Instantiating fields for entity 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;
 		}
-		if ( $type === Object_Type_Enum::POST ) {
-			$entity_type = wl_entity_taxonomy_get_custom_fields( $id );
-		} else if ( $type === Object_Type_Enum::TERM ) {
-			$term_entity_types = get_term_meta( $id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME );
-			$term_entity_types = array_map( function ( $term ) {
+		if ($type === Object_Type_Enum::POST) {
+			$entity_type = wl_entity_taxonomy_get_custom_fields($id);
+		} else if ($type === Object_Type_Enum::TERM) {
+			$term_entity_types = get_term_meta($id, Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME);
+			$term_entity_types = array_map(function($term) {
 				return get_term_by(
 					'slug',
 					$term,
 					Wordlift_Entity_Type_Taxonomy_Service::TAXONOMY_NAME
 				);
-			}, $term_entity_types );
-			$entity_type       = wl_get_custom_fields_by_entity_type( $term_entity_types );
+			}, $term_entity_types);
+			$entity_type = wl_get_custom_fields_by_entity_type($term_entity_types);
 		}
-		if ( isset( $entity_type ) ) {
+		if (isset($entity_type)) {
 
 			/*
 			 * Might not have any relevant meta box field, for example for articles,
@@ -150,31 +150,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, false, $type, $id );
+				$this->add_field($info, false, $type, $id);
 
 			}
 
 			// 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, $type, $id );
+				$this->add_field($info, true, $type, $id);
 
 			}
 		}
@@ -188,34 +188,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);
 	}
 
 	/**
@@ -227,29 +227,29 @@ 
 	 * @param int $type Post or Term, based on the correct decorator would be selected.
 	 * @param int $id Identifier for the type.
 	 */
-	public function add_field( $args, $grouped, $type, $id ) {
+	public function add_field($args, $grouped, $type, $id) {
 
-		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.
@@ -263,7 +263,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'];
 
 			}
 
@@ -276,14 +276,14 @@ 
 		 * @since 3.31.6
 		 * Add namespace to initialize class.
 		 */
-		if ( substr( $field_class, 0, 1 ) !== '\\' ) {
-			$field_class = 'Wordlift\Metabox\Field\\' . $field_class;
+		if (substr($field_class, 0, 1) !== '\\') {
+			$field_class = 'Wordlift\Metabox\Field\\'.$field_class;
 			// End if().
 		}
 
-		if ( class_exists( $field_class ) ) {
+		if (class_exists($field_class)) {
 			// Get decorator and use it as wrapper for save_data and get_data methods.
-			$instance = new $field_class( $args, $id, $type );
+			$instance = new $field_class($args, $id, $type);
 			// Call apropriate constructor (e.g. Wl_Metabox_Field... ).
 			$this->fields[] = $instance;
 		}
@@ -299,45 +299,45 @@ 
 	 *
 	 * @since 3.5.4
 	 */
-	public function save_form_data( $id, $type ) {
+	public function save_form_data($id, $type) {
 
-		$this->log->trace( "Saving form data for entity post $id..." );
+		$this->log->trace("Saving form data for entity post $id...");
 
 		// Skip saving if the save is called for a different post.
-		if ( isset( $_POST['post_ID'] ) && (int) $_POST['post_ID'] !== $id  && $type === Object_Type_Enum::POST ) {
-			$this->log->debug( "`wl_metaboxes`, skipping because the post id from request doesnt match the id from filter." );
+		if (isset($_POST['post_ID']) && (int) $_POST['post_ID'] !== $id && $type === Object_Type_Enum::POST) {
+			$this->log->debug("`wl_metaboxes`, skipping because the post id from request doesnt match the id from filter.");
 			return;
 		}
 
 
 		// Build Field objects.
-		$this->instantiate_fields( $id, $type );
+		$this->instantiate_fields($id, $type);
 
 		// Check if WL metabox form was posted.
-		if ( ! isset( $_POST['wl_metaboxes'] ) ) {
-			$this->log->debug( "`wl_metaboxes`, skipping..." );
+		if ( ! isset($_POST['wl_metaboxes'])) {
+			$this->log->debug("`wl_metaboxes`, skipping...");
 
 			return;
 		}
 
 		$posted_data = $_POST['wl_metaboxes'];
 
-		foreach ( $this->fields as $field ) {
+		foreach ($this->fields as $field) {
 
 			// Verify nonce.
 			$valid_nonce = $field->verify_nonce();
 
-			if ( $valid_nonce ) {
+			if ($valid_nonce) {
 				$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);
 				}
 			}
 		}
@@ -352,7 +352,7 @@ 
 		 * @since  3.18.2
 		 *
 		 */
-		do_action( 'wl_save_form_pre_push_entity', $id, $_POST );
+		do_action('wl_save_form_pre_push_entity', $id, $_POST);
 
 	}
 
@@ -364,18 +364,18 @@ 
 	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( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.css", array(), '3.0.6' );
-		wp_enqueue_script( 'wl-flatpickr', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . "/admin/js/flatpickr/flatpickr$min.js", array( 'jquery' ), '3.0.6', true );
+		wp_enqueue_style('wl-flatpickr', dirname(dirname(plugin_dir_url(__FILE__)))."/admin/js/flatpickr/flatpickr$min.css", array(), '3.0.6');
+		wp_enqueue_script('wl-flatpickr', dirname(dirname(plugin_dir_url(__FILE__)))."/admin/js/flatpickr/flatpickr$min.js", array('jquery'), '3.0.6', true);
 
 		wl_enqueue_leaflet();
 
 		// Add AJAX autocomplete to facilitate metabox editing.
-		wp_enqueue_script( 'wl-entity-metabox-utility', dirname( dirname( plugin_dir_url( __FILE__ ) ) ) . '/admin/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(dirname(plugin_dir_url(__FILE__))).'/admin/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/wordlift/external-plugin-hooks/recipe-maker/class-recipe-maker-warning.php

Indentation +81 added lines, -81 removed lines

@@ -10,102 +10,102 @@
  */
 class Recipe_Maker_Warning {
 
-	/**
-	 * @var Recipe_Maker_Validation_Service
-	 */
-	private $recipe_maker_validation_service;
-
-	public function __construct( $recipe_maker_validation_service ) {
-		$this->recipe_maker_validation_service = $recipe_maker_validation_service;
-		/**
-		 * Filter: wl_feature__enable__notices.
-		 *
-		 * @param bool whether the notices needs to be enabled or not.
-		 *
-		 * @return bool
-		 * @since 3.27.6
-		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'display_image_size_warning' ) );
-		}
-	}
-
-	/**
-	 * Show the warning after applying the conditions.
-	 */
-	public function display_image_size_warning() {
-
-		// Check if we are on the post.
-		if ( ! get_post() instanceof \WP_Post ) {
-			return false;
-		}
-		if ( ! $this->recipe_maker_validation_service->is_wp_recipe_maker_available() ) {
-			return false;
-		}
-		$post_id = get_the_ID();
-
-		// Dont show notification if there is no recipes referred by the post.
-		if ( ! $this->recipe_maker_validation_service->is_atleast_once_recipe_present_in_the_post( $post_id ) ) {
-			return false;
-		}
-
-		$recipe_with_image_warnings = $this->get_warnings( $post_id );
-
-		if ( count( $recipe_with_image_warnings ) > 0 ) {
-			// Show notification.
-			?>
+    /**
+     * @var Recipe_Maker_Validation_Service
+     */
+    private $recipe_maker_validation_service;
+
+    public function __construct( $recipe_maker_validation_service ) {
+        $this->recipe_maker_validation_service = $recipe_maker_validation_service;
+        /**
+         * Filter: wl_feature__enable__notices.
+         *
+         * @param bool whether the notices needs to be enabled or not.
+         *
+         * @return bool
+         * @since 3.27.6
+         */
+        if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
+            add_action( 'admin_notices', array( $this, 'display_image_size_warning' ) );
+        }
+    }
+
+    /**
+     * Show the warning after applying the conditions.
+     */
+    public function display_image_size_warning() {
+
+        // Check if we are on the post.
+        if ( ! get_post() instanceof \WP_Post ) {
+            return false;
+        }
+        if ( ! $this->recipe_maker_validation_service->is_wp_recipe_maker_available() ) {
+            return false;
+        }
+        $post_id = get_the_ID();
+
+        // Dont show notification if there is no recipes referred by the post.
+        if ( ! $this->recipe_maker_validation_service->is_atleast_once_recipe_present_in_the_post( $post_id ) ) {
+            return false;
+        }
+
+        $recipe_with_image_warnings = $this->get_warnings( $post_id );
+
+        if ( count( $recipe_with_image_warnings ) > 0 ) {
+            // Show notification.
+            ?>
             <div class="notice notice-warning is-dismissible">
                 <p><?php echo wp_kses( __( 'The following recipes didnt have minimum image size of 1200 x 1200 px', 'wordlift' ), array() ); ?></p>
                 <ol>
 					<?php
-					foreach ( $recipe_with_image_warnings as $post_id ) {
-						echo "<li>" . esc_html( get_the_title( $post_id ) ) . "</li>";
-					}
-					?>
+                    foreach ( $recipe_with_image_warnings as $post_id ) {
+                        echo "<li>" . esc_html( get_the_title( $post_id ) ) . "</li>";
+                    }
+                    ?>
                 </ol>
             </div>
 			<?php
-		}
+        }
 
-	}
+    }
 
-	/**
-	 * @param $post_id
-	 *
-	 * @return array
-	 */
-	private function get_warnings( $post_id ) {
+    /**
+     * @param $post_id
+     *
+     * @return array
+     */
+    private function get_warnings( $post_id ) {
 
-		$recipe_ids = \WPRM_Recipe_Manager::get_recipe_ids_from_post( $post_id );
+        $recipe_ids = \WPRM_Recipe_Manager::get_recipe_ids_from_post( $post_id );
 
-		// Dont show duplicate warnings.
-		$recipe_ids = array_unique( $recipe_ids );
+        // Dont show duplicate warnings.
+        $recipe_ids = array_unique( $recipe_ids );
 
-		$recipe_with_image_warnings = array();
+        $recipe_with_image_warnings = array();
 
-		foreach ( $recipe_ids as $recipe_id ) {
-			$recipe     = \WPRM_Recipe_Manager::get_recipe( $recipe_id );
+        foreach ( $recipe_ids as $recipe_id ) {
+            $recipe     = \WPRM_Recipe_Manager::get_recipe( $recipe_id );
             if (  ! $recipe ) {
                 continue;
             }
-			$image_id   = $recipe->image_id();
-			$image_data = wp_get_attachment_image_src( $image_id, array( 1200, 1200 ) );
-			if ( ! is_array( $image_data ) ) {
-				continue;
-			}
-			$image_width  = array_key_exists( 1, $image_data ) ? $image_data [1] : false;
-			$image_height = array_key_exists( 2, $image_data ) ? $image_data [2] : false;
-			if ( ! ( $image_height && $image_width ) ) {
-				continue;
-			}
-
-			if ( $image_height < 1200 || $image_width < 1200 ) {
-				// Image size not present in 1200 * 1200, show a warning.
-				$recipe_with_image_warnings[] = $recipe_id;
-			}
-		}
-
-		return $recipe_with_image_warnings;
-	}
+            $image_id   = $recipe->image_id();
+            $image_data = wp_get_attachment_image_src( $image_id, array( 1200, 1200 ) );
+            if ( ! is_array( $image_data ) ) {
+                continue;
+            }
+            $image_width  = array_key_exists( 1, $image_data ) ? $image_data [1] : false;
+            $image_height = array_key_exists( 2, $image_data ) ? $image_data [2] : false;
+            if ( ! ( $image_height && $image_width ) ) {
+                continue;
+            }
+
+            if ( $image_height < 1200 || $image_width < 1200 ) {
+                // Image size not present in 1200 * 1200, show a warning.
+                $recipe_with_image_warnings[] = $recipe_id;
+            }
+        }
+
+        return $recipe_with_image_warnings;
+    }
 
 }

Spacing +23 added lines, -23 removed lines

@@ -15,7 +15,7 @@ 
 	 */
 	private $recipe_maker_validation_service;
 
-	public function __construct( $recipe_maker_validation_service ) {
+	public function __construct($recipe_maker_validation_service) {
 		$this->recipe_maker_validation_service = $recipe_maker_validation_service;
 		/**
 		 * Filter: wl_feature__enable__notices.
@@ -25,8 +25,8 @@ 
 		 * @return bool
 		 * @since 3.27.6
 		 */
-		if ( apply_filters( 'wl_feature__enable__notices', true ) ) {
-			add_action( 'admin_notices', array( $this, 'display_image_size_warning' ) );
+		if (apply_filters('wl_feature__enable__notices', true)) {
+			add_action('admin_notices', array($this, 'display_image_size_warning'));
 		}
 	}
 
@@ -36,30 +36,30 @@ 
 	public function display_image_size_warning() {
 
 		// Check if we are on the post.
-		if ( ! get_post() instanceof \WP_Post ) {
+		if ( ! get_post() instanceof \WP_Post) {
 			return false;
 		}
-		if ( ! $this->recipe_maker_validation_service->is_wp_recipe_maker_available() ) {
+		if ( ! $this->recipe_maker_validation_service->is_wp_recipe_maker_available()) {
 			return false;
 		}
 		$post_id = get_the_ID();
 
 		// Dont show notification if there is no recipes referred by the post.
-		if ( ! $this->recipe_maker_validation_service->is_atleast_once_recipe_present_in_the_post( $post_id ) ) {
+		if ( ! $this->recipe_maker_validation_service->is_atleast_once_recipe_present_in_the_post($post_id)) {
 			return false;
 		}
 
-		$recipe_with_image_warnings = $this->get_warnings( $post_id );
+		$recipe_with_image_warnings = $this->get_warnings($post_id);
 
-		if ( count( $recipe_with_image_warnings ) > 0 ) {
+		if (count($recipe_with_image_warnings) > 0) {
 			// Show notification.
 			?>
             <div class="notice notice-warning is-dismissible">
-                <p><?php echo wp_kses( __( 'The following recipes didnt have minimum image size of 1200 x 1200 px', 'wordlift' ), array() ); ?></p>
+                <p><?php echo wp_kses(__('The following recipes didnt have minimum image size of 1200 x 1200 px', 'wordlift'), array()); ?></p>
                 <ol>
 					<?php
-					foreach ( $recipe_with_image_warnings as $post_id ) {
-						echo "<li>" . esc_html( get_the_title( $post_id ) ) . "</li>";
+					foreach ($recipe_with_image_warnings as $post_id) {
+						echo "<li>".esc_html(get_the_title($post_id))."</li>";
 					}
 					?>
                 </ol>
@@ -74,32 +74,32 @@ 
 	 *
 	 * @return array
 	 */
-	private function get_warnings( $post_id ) {
+	private function get_warnings($post_id) {
 
-		$recipe_ids = \WPRM_Recipe_Manager::get_recipe_ids_from_post( $post_id );
+		$recipe_ids = \WPRM_Recipe_Manager::get_recipe_ids_from_post($post_id);
 
 		// Dont show duplicate warnings.
-		$recipe_ids = array_unique( $recipe_ids );
+		$recipe_ids = array_unique($recipe_ids);
 
 		$recipe_with_image_warnings = array();
 
-		foreach ( $recipe_ids as $recipe_id ) {
-			$recipe     = \WPRM_Recipe_Manager::get_recipe( $recipe_id );
-            if (  ! $recipe ) {
+		foreach ($recipe_ids as $recipe_id) {
+			$recipe = \WPRM_Recipe_Manager::get_recipe($recipe_id);
+            if ( ! $recipe) {
                 continue;
             }
 			$image_id   = $recipe->image_id();
-			$image_data = wp_get_attachment_image_src( $image_id, array( 1200, 1200 ) );
-			if ( ! is_array( $image_data ) ) {
+			$image_data = wp_get_attachment_image_src($image_id, array(1200, 1200));
+			if ( ! is_array($image_data)) {
 				continue;
 			}
-			$image_width  = array_key_exists( 1, $image_data ) ? $image_data [1] : false;
-			$image_height = array_key_exists( 2, $image_data ) ? $image_data [2] : false;
-			if ( ! ( $image_height && $image_width ) ) {
+			$image_width  = array_key_exists(1, $image_data) ? $image_data [1] : false;
+			$image_height = array_key_exists(2, $image_data) ? $image_data [2] : false;
+			if ( ! ($image_height && $image_width)) {
 				continue;
 			}
 
-			if ( $image_height < 1200 || $image_width < 1200 ) {
+			if ($image_height < 1200 || $image_width < 1200) {
 				// Image size not present in 1200 * 1200, show a warning.
 				$recipe_with_image_warnings[] = $recipe_id;
 			}

src/wordlift/configuration/class-config.php

Indentation +151 added lines, -151 removed lines

@@ -4,186 +4,186 @@
 
 
 class Config {
-	/**
-	 * @var \Wordlift_Admin_Setup
-	 */
-	private $admin_setup;
-	/**
-	 * @var \Wordlift_Key_Validation_Service
-	 */
-	private $key_validation_service;
-
-	/**
-	 * Config constructor.
-	 *
-	 * @param $admin_setup \Wordlift_Admin_Setup
-	 * @param $key_validation_service \Wordlift_Key_Validation_Service
-	 */
-	public function __construct( $admin_setup, $key_validation_service ) {
-
-		$this->admin_setup            = $admin_setup;
-		$this->key_validation_service = $key_validation_service;
-		add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
-
-	}
-
-	/**
-	 * Check if the key is valid and also not bound to any domain.
-	 *
-	 * @param $key string
-	 *
-	 * @return bool
-	 */
-	private function is_key_valid_and_not_bound_to_any_domain( $key ) {
-		$account_info = $this->key_validation_service->get_account_info( $key );
-
-		/**
-		 * we need to check if the key is not associated with any account
-		 * before setting it, we should check if the url is null.
-		 */
-		if ( is_wp_error( $account_info )
-		     || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
-			return false;
-		}
-
-		$account_info_json = $account_info['body'];
-
-		$account_info_data = json_decode( $account_info_json, true );
-
-		if ( ! $account_info_data ) {
-			// Invalid json returned by api.
-			return false;
-		}
-
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
-
-
-		if ( $account_info_data['url'] === null ) {
-			return true;
-		}
-
-		// Check if the key belongs to same site.
-		if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
-			// key already associated with another account.
-			return false;
-		}
-
-		// Return true if the key domain and site domain are the same.
-		return true;
-	}
-
-
-	public function config() {
-
-		// Perform validation check for all the parameters.
-		$required_fields = array(
-			'diagnostic',
-			'vocabulary',
+    /**
+     * @var \Wordlift_Admin_Setup
+     */
+    private $admin_setup;
+    /**
+     * @var \Wordlift_Key_Validation_Service
+     */
+    private $key_validation_service;
+
+    /**
+     * Config constructor.
+     *
+     * @param $admin_setup \Wordlift_Admin_Setup
+     * @param $key_validation_service \Wordlift_Key_Validation_Service
+     */
+    public function __construct( $admin_setup, $key_validation_service ) {
+
+        $this->admin_setup            = $admin_setup;
+        $this->key_validation_service = $key_validation_service;
+        add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
+
+    }
+
+    /**
+     * Check if the key is valid and also not bound to any domain.
+     *
+     * @param $key string
+     *
+     * @return bool
+     */
+    private function is_key_valid_and_not_bound_to_any_domain( $key ) {
+        $account_info = $this->key_validation_service->get_account_info( $key );
+
+        /**
+         * we need to check if the key is not associated with any account
+         * before setting it, we should check if the url is null.
+         */
+        if ( is_wp_error( $account_info )
+             || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
+            return false;
+        }
+
+        $account_info_json = $account_info['body'];
+
+        $account_info_data = json_decode( $account_info_json, true );
+
+        if ( ! $account_info_data ) {
+            // Invalid json returned by api.
+            return false;
+        }
+
+        $site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
+
+
+        if ( $account_info_data['url'] === null ) {
+            return true;
+        }
+
+        // Check if the key belongs to same site.
+        if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
+            // key already associated with another account.
+            return false;
+        }
+
+        // Return true if the key domain and site domain are the same.
+        return true;
+    }
+
+
+    public function config() {
+
+        // Perform validation check for all the parameters.
+        $required_fields = array(
+            'diagnostic',
+            'vocabulary',
 // Don't ask for language from webapp.
 //			'language',
-			'country',
-			'publisherName',
-			'publisher',
-			'license'
-		);
+            'country',
+            'publisherName',
+            'publisher',
+            'license'
+        );
 
-		header( 'Access-Control-Allow-Origin: *' );
+        header( 'Access-Control-Allow-Origin: *' );
 
-		// validate all the fields before processing
-		foreach ( $required_fields as $field ) {
-			if ( ! array_key_exists( $field, $_POST ) ) {
-				wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
+        // validate all the fields before processing
+        foreach ( $required_fields as $field ) {
+            if ( ! array_key_exists( $field, $_POST ) ) {
+                wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
 
-				return;
-			}
-		}
+                return;
+            }
+        }
 
-		$key = wp_unslash( (string) $_POST['license'] );
+        $key = wp_unslash( (string) $_POST['license'] );
 
-		if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
-			wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
+        if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
+            wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
 
-			// exit if not valid.
-			return;
-		}
+            // exit if not valid.
+            return;
+        }
 
 
-		// check if key is already configured, if yes then dont save settings.
-		if ( \Wordlift_Configuration_Service::get_instance()->get_key() ) {
-			wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
+        // check if key is already configured, if yes then dont save settings.
+        if ( \Wordlift_Configuration_Service::get_instance()->get_key() ) {
+            wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
 
-			// key already configured
-			return;
-		}
+            // key already configured
+            return;
+        }
 
-		$this->admin_setup->save_configuration( $this->get_params() );
+        $this->admin_setup->save_configuration( $this->get_params() );
 
 
-		wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
-	}
+        wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
+    }
 
-	/**
-	 *
-	 * @return array
-	 */
-	private function get_params() {
+    /**
+     *
+     * @return array
+     */
+    private function get_params() {
 
-		$attachment_id = $this->may_be_get_attachment_id();
+        $attachment_id = $this->may_be_get_attachment_id();
 
-		$params = array(
-			'key'             => isset( $_POST['license'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['license'] ) ) : '',
-			'vocabulary'      => isset( $_POST['vocabulary'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['vocabulary'] ) ) : '',
-			'wl-country-code' => isset( $_POST['country'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['country'] ) ) : '',
-			'name'            => isset( $_POST['publisherName'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisherName'] ) ) : '',
-			'user_type'       => isset( $_POST['publisher'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisher'] ) ) : '',
-			'logo'            => $attachment_id
-		);
+        $params = array(
+            'key'             => isset( $_POST['license'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['license'] ) ) : '',
+            'vocabulary'      => isset( $_POST['vocabulary'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['vocabulary'] ) ) : '',
+            'wl-country-code' => isset( $_POST['country'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['country'] ) ) : '',
+            'name'            => isset( $_POST['publisherName'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisherName'] ) ) : '',
+            'user_type'       => isset( $_POST['publisher'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisher'] ) ) : '',
+            'logo'            => $attachment_id
+        );
 
-		$diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
-		if ( $diagnostic ) {
-			$params['share-diagnostic'] = 'on';
-		}
+        $diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
+        if ( $diagnostic ) {
+            $params['share-diagnostic'] = 'on';
+        }
 
-		return $params;
-	}
+        return $params;
+    }
 
-	/**
-	 * @return int | bool
-	 */
-	private function may_be_get_attachment_id() {
+    /**
+     * @return int | bool
+     */
+    private function may_be_get_attachment_id() {
 
-		// if image or image extension not posted then return false.
-		if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
-			return false;
-		}
+        // if image or image extension not posted then return false.
+        if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
+            return false;
+        }
 
-		$allowed_extensions = array( 'png', 'jpeg', 'jpg' );
-		$image_string       = sanitize_text_field( wp_unslash( (string) $_POST['image'] ) );
-		$image_ext          = sanitize_text_field( wp_unslash( (string) $_POST['imageExtension'] ) );
+        $allowed_extensions = array( 'png', 'jpeg', 'jpg' );
+        $image_string       = sanitize_text_field( wp_unslash( (string) $_POST['image'] ) );
+        $image_ext          = sanitize_text_field( wp_unslash( (string) $_POST['imageExtension'] ) );
 
-		if ( ! in_array( $image_ext, $allowed_extensions ) ) {
-			return false;
-		}
+        if ( ! in_array( $image_ext, $allowed_extensions ) ) {
+            return false;
+        }
 
-		$image_decoded_string = base64_decode( $image_string );
+        $image_decoded_string = base64_decode( $image_string );
 
-		$upload_dir = wp_upload_dir();
+        $upload_dir = wp_upload_dir();
 
-		$file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
+        $file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
 
-		file_put_contents( $file_path, $image_decoded_string );
+        file_put_contents( $file_path, $image_decoded_string );
 
-		$attachment_id = wp_insert_attachment( array(
-			'post_status'    => 'inherit',
-			'post_mime_type' => "image/$image_ext"
-		), $file_path );
+        $attachment_id = wp_insert_attachment( array(
+            'post_status'    => 'inherit',
+            'post_mime_type' => "image/$image_ext"
+        ), $file_path );
 
-		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
-		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+        // Generate the metadata for the attachment, and update the database record.
+        $attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
+        // Update the attachment metadata.
+        wp_update_attachment_metadata( $attachment_id, $attachment_data );
 
-		return $attachment_id;
-	}
+        return $attachment_id;
+    }
 
 }

Spacing +41 added lines, -41 removed lines

@@ -19,11 +19,11 @@ 
 	 * @param $admin_setup \Wordlift_Admin_Setup
 	 * @param $key_validation_service \Wordlift_Key_Validation_Service
 	 */
-	public function __construct( $admin_setup, $key_validation_service ) {
+	public function __construct($admin_setup, $key_validation_service) {
 
 		$this->admin_setup            = $admin_setup;
 		$this->key_validation_service = $key_validation_service;
-		add_action( 'wp_ajax_nopriv_wl_config_plugin', array( $this, 'config' ) );
+		add_action('wp_ajax_nopriv_wl_config_plugin', array($this, 'config'));
 
 	}
 
@@ -34,36 +34,36 @@ 
 	 *
 	 * @return bool
 	 */
-	private function is_key_valid_and_not_bound_to_any_domain( $key ) {
-		$account_info = $this->key_validation_service->get_account_info( $key );
+	private function is_key_valid_and_not_bound_to_any_domain($key) {
+		$account_info = $this->key_validation_service->get_account_info($key);
 
 		/**
 		 * we need to check if the key is not associated with any account
 		 * before setting it, we should check if the url is null.
 		 */
-		if ( is_wp_error( $account_info )
-		     || wp_remote_retrieve_response_code( $account_info ) !== 200 ) {
+		if (is_wp_error($account_info)
+		     || wp_remote_retrieve_response_code($account_info) !== 200) {
 			return false;
 		}
 
 		$account_info_json = $account_info['body'];
 
-		$account_info_data = json_decode( $account_info_json, true );
+		$account_info_data = json_decode($account_info_json, true);
 
-		if ( ! $account_info_data ) {
+		if ( ! $account_info_data) {
 			// Invalid json returned by api.
 			return false;
 		}
 
-		$site_url = apply_filters( 'wl_production_site_url', untrailingslashit( get_option( 'home' ) ) );
+		$site_url = apply_filters('wl_production_site_url', untrailingslashit(get_option('home')));
 
 
-		if ( $account_info_data['url'] === null ) {
+		if ($account_info_data['url'] === null) {
 			return true;
 		}
 
 		// Check if the key belongs to same site.
-		if ( $site_url !== untrailingslashit( $account_info_data['url'] ) ) {
+		if ($site_url !== untrailingslashit($account_info_data['url'])) {
 			// key already associated with another account.
 			return false;
 		}
@@ -87,21 +87,21 @@ 
 			'license'
 		);
 
-		header( 'Access-Control-Allow-Origin: *' );
+		header('Access-Control-Allow-Origin: *');
 
 		// validate all the fields before processing
-		foreach ( $required_fields as $field ) {
-			if ( ! array_key_exists( $field, $_POST ) ) {
-				wp_send_json_error( sprintf( __( 'Field %s is required', 'wordlift' ), $field ), 422 );
+		foreach ($required_fields as $field) {
+			if ( ! array_key_exists($field, $_POST)) {
+				wp_send_json_error(sprintf(__('Field %s is required', 'wordlift'), $field), 422);
 
 				return;
 			}
 		}
 
-		$key = wp_unslash( (string) $_POST['license'] );
+		$key = wp_unslash((string) $_POST['license']);
 
-		if ( ! $this->is_key_valid_and_not_bound_to_any_domain( $key ) ) {
-			wp_send_json_error( __( 'Key is not valid or associated with other domain', 'wordlift' ), 403 );
+		if ( ! $this->is_key_valid_and_not_bound_to_any_domain($key)) {
+			wp_send_json_error(__('Key is not valid or associated with other domain', 'wordlift'), 403);
 
 			// exit if not valid.
 			return;
@@ -109,17 +109,17 @@ 
 
 
 		// check if key is already configured, if yes then dont save settings.
-		if ( \Wordlift_Configuration_Service::get_instance()->get_key() ) {
-			wp_send_json_error( __( 'Key already configured.', 'wordlift' ), 403 );
+		if (\Wordlift_Configuration_Service::get_instance()->get_key()) {
+			wp_send_json_error(__('Key already configured.', 'wordlift'), 403);
 
 			// key already configured
 			return;
 		}
 
-		$this->admin_setup->save_configuration( $this->get_params() );
+		$this->admin_setup->save_configuration($this->get_params());
 
 
-		wp_send_json_success( __( 'Configuration Saved', 'wordlift' ) );
+		wp_send_json_success(__('Configuration Saved', 'wordlift'));
 	}
 
 	/**
@@ -131,16 +131,16 @@ 
 		$attachment_id = $this->may_be_get_attachment_id();
 
 		$params = array(
-			'key'             => isset( $_POST['license'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['license'] ) ) : '',
-			'vocabulary'      => isset( $_POST['vocabulary'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['vocabulary'] ) ) : '',
-			'wl-country-code' => isset( $_POST['country'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['country'] ) ) : '',
-			'name'            => isset( $_POST['publisherName'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisherName'] ) ) : '',
-			'user_type'       => isset( $_POST['publisher'] ) ? sanitize_text_field( wp_unslash( (string) $_POST['publisher'] ) ) : '',
+			'key'             => isset($_POST['license']) ? sanitize_text_field(wp_unslash((string) $_POST['license'])) : '',
+			'vocabulary'      => isset($_POST['vocabulary']) ? sanitize_text_field(wp_unslash((string) $_POST['vocabulary'])) : '',
+			'wl-country-code' => isset($_POST['country']) ? sanitize_text_field(wp_unslash((string) $_POST['country'])) : '',
+			'name'            => isset($_POST['publisherName']) ? sanitize_text_field(wp_unslash((string) $_POST['publisherName'])) : '',
+			'user_type'       => isset($_POST['publisher']) ? sanitize_text_field(wp_unslash((string) $_POST['publisher'])) : '',
 			'logo'            => $attachment_id
 		);
 
-		$diagnostic = isset( $_POST['diagnostic'] ) ? (bool) $_POST['diagnostic'] : false;
-		if ( $diagnostic ) {
+		$diagnostic = isset($_POST['diagnostic']) ? (bool) $_POST['diagnostic'] : false;
+		if ($diagnostic) {
 			$params['share-diagnostic'] = 'on';
 		}
 
@@ -153,35 +153,35 @@ 
 	private function may_be_get_attachment_id() {
 
 		// if image or image extension not posted then return false.
-		if ( ! isset( $_POST['image'] ) || ! isset( $_POST['imageExtension'] ) ) {
+		if ( ! isset($_POST['image']) || ! isset($_POST['imageExtension'])) {
 			return false;
 		}
 
-		$allowed_extensions = array( 'png', 'jpeg', 'jpg' );
-		$image_string       = sanitize_text_field( wp_unslash( (string) $_POST['image'] ) );
-		$image_ext          = sanitize_text_field( wp_unslash( (string) $_POST['imageExtension'] ) );
+		$allowed_extensions = array('png', 'jpeg', 'jpg');
+		$image_string       = sanitize_text_field(wp_unslash((string) $_POST['image']));
+		$image_ext          = sanitize_text_field(wp_unslash((string) $_POST['imageExtension']));
 
-		if ( ! in_array( $image_ext, $allowed_extensions ) ) {
+		if ( ! in_array($image_ext, $allowed_extensions)) {
 			return false;
 		}
 
-		$image_decoded_string = base64_decode( $image_string );
+		$image_decoded_string = base64_decode($image_string);
 
 		$upload_dir = wp_upload_dir();
 
-		$file_path = $upload_dir['path'] . DIRECTORY_SEPARATOR . md5( $image_string ) . "." . $image_ext;
+		$file_path = $upload_dir['path'].DIRECTORY_SEPARATOR.md5($image_string).".".$image_ext;
 
-		file_put_contents( $file_path, $image_decoded_string );
+		file_put_contents($file_path, $image_decoded_string);
 
-		$attachment_id = wp_insert_attachment( array(
+		$attachment_id = wp_insert_attachment(array(
 			'post_status'    => 'inherit',
 			'post_mime_type' => "image/$image_ext"
-		), $file_path );
+		), $file_path);
 
 		// Generate the metadata for the attachment, and update the database record.
-		$attachment_data = wp_generate_attachment_metadata( $attachment_id, $file_path );
+		$attachment_data = wp_generate_attachment_metadata($attachment_id, $file_path);
 		// Update the attachment metadata.
-		wp_update_attachment_metadata( $attachment_id, $attachment_data );
+		wp_update_attachment_metadata($attachment_id, $attachment_data);
 
 		return $attachment_id;
 	}

src/wordlift/cache/class-ttl-cache-cleaner.php

Indentation +184 added lines, -184 removed lines

@@ -21,191 +21,191 @@
 
 class Ttl_Cache_Cleaner {
 
-	const PATH = 0;
-	const MTIME = 1;
-	const SIZE = 2;
+    const PATH = 0;
+    const MTIME = 1;
+    const SIZE = 2;
 
-	/**
-	 * The max TTL in seconds.
-	 *
-	 * @access private
-	 * @var int $ttl The max TTL in seconds.
-	 */
-	private $ttl;
+    /**
+     * The max TTL in seconds.
+     *
+     * @access private
+     * @var int $ttl The max TTL in seconds.
+     */
+    private $ttl;
 
-	/**
-	 * The max size in bytes.
-	 *
-	 * @access private
-	 * @var int $ttl The max size in bytes.
-	 */
-	private $max_size;
-
-	/**
-	 * Ttl_Cache_Cleaner constructor.
-	 *
-	 * @param int $ttl The max TTL in seconds.
-	 * @param int $max_size The max size in bytes.
-	 */
-	public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
-
-		$this->ttl      = $ttl;
-		$this->max_size = $max_size;
-
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
-		add_action( 'wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
-
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-		add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-
-		// Do not bother to configure scheduled tasks while running on the front-end.
-		if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
-			wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
-		}
-
-	}
-
-	public static function deactivate() {
-
-		$timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
-		wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
-
-	}
-
-	public function flush() {
-
-		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
-
-		foreach ( $files as $file ) {
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
-		}
-
-		$action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : '';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'wl_ttl_cache_cleaner__flush' === $action ) {
-			wp_send_json_success( count( $files ) );
-		}
-	}
-
-	public function cleanup() {
-
-		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
-
-		// Get the max mtime.
-		$max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
-
-		// Keep the original count for statistics that we're going to send the client.
-		$original_count = count( $files );
-
-		// Sort by size ascending.
-		usort( $files, function ( $f1, $f2 ) {
-			if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
-				return 0;
-			}
-
-			return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
-		} );
-
-		// Start removing stale files.
-		for ( $i = 0; $i < count( $files ); $i ++ ) {
-			$file = $files[ $i ];
-			// Break if the mtime is within the range.
-			if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
-				break;
-			}
-
-			unset( $files[ $i ] );
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
-		}
-
-		// Calculate the size.
-		$total_size = array_reduce( $files, function ( $carry, $item ) {
-
-			return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
-		}, 0 );
-
-
-		// Remove files until we're within the max size.
-		while ( $total_size > $this->max_size ) {
-			$file       = array_shift( $files );
-			$total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
-		}
-
-		// Send back some stats.
-		wp_send_json_success( array(
-			'initial_count' => $original_count,
-			'current_count' => count( $files ),
-			'current_size'  => $total_size,
-		) );
-	}
-
-	private function reduce( $accumulator, $path ) {
-
-		/**
-		 * Bail out if the path doesn't exist.
-		 *
-		 * Avoid warnings when trying to open a path which doesn't exist.
-		 *
-		 * @since 3.23.0
-		 * @see https://github.com/insideout10/wordlift-plugin/issues/966
-		 */
-		if ( ! file_exists( $path ) ) {
-			return $accumulator;
-		}
-
-		// Open the dir handle.
-		$handle = opendir( $path );
-
-		// Catch exceptions to be sure to close the dir handle.
-		try {
-			$accumulator = @$this->_reduce( $accumulator, $path, $handle );
-		} catch ( Exception $e ) {
-			// Do nothing.
-		}
-
-		// Finally close the directory handle.
-		closedir( $handle );
-
-		return $accumulator;
-	}
-
-	/**
-	 * @param $accumulator
-	 * @param $path
-	 * @param $handle
-	 *
-	 * @return array
-	 */
-	private function _reduce( $accumulator, $path, $handle ) {
-
-		while ( false !== ( $entry = readdir( $handle ) ) ) {
-
-			// Skip to the next one.
-			if ( 0 === strpos( $entry, '.' ) ) {
-				continue;
-			}
-
-			// Set the full path to the entry.
-			$entry_path = $path . DIRECTORY_SEPARATOR . $entry;
-
-			// Handle directories.
-			if ( is_dir( $entry_path ) ) {
-				$accumulator = $this->reduce( $accumulator, $entry_path );
-
-				continue;
-			}
-
-			// Store the file data.
-			$accumulator[] = array(
-				$entry_path,
-				filemtime( $entry_path ),
-				filesize( $entry_path ),
-			);
-		}
-
-		return $accumulator;
-	}
+    /**
+     * The max size in bytes.
+     *
+     * @access private
+     * @var int $ttl The max size in bytes.
+     */
+    private $max_size;
+
+    /**
+     * Ttl_Cache_Cleaner constructor.
+     *
+     * @param int $ttl The max TTL in seconds.
+     * @param int $max_size The max size in bytes.
+     */
+    public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
+
+        $this->ttl      = $ttl;
+        $this->max_size = $max_size;
+
+        add_action( 'wp_ajax_wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
+        add_action( 'wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
+
+        add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+        add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+
+        // Do not bother to configure scheduled tasks while running on the front-end.
+        if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
+            wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
+        }
+
+    }
+
+    public static function deactivate() {
+
+        $timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
+        wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
+
+    }
+
+    public function flush() {
+
+        // Get all the files, recursive.
+        $files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+
+        foreach ( $files as $file ) {
+            @unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+        }
+
+        $action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : '';
+        if ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'wl_ttl_cache_cleaner__flush' === $action ) {
+            wp_send_json_success( count( $files ) );
+        }
+    }
+
+    public function cleanup() {
+
+        // Get all the files, recursive.
+        $files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+
+        // Get the max mtime.
+        $max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
+
+        // Keep the original count for statistics that we're going to send the client.
+        $original_count = count( $files );
+
+        // Sort by size ascending.
+        usort( $files, function ( $f1, $f2 ) {
+            if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
+                return 0;
+            }
+
+            return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
+        } );
+
+        // Start removing stale files.
+        for ( $i = 0; $i < count( $files ); $i ++ ) {
+            $file = $files[ $i ];
+            // Break if the mtime is within the range.
+            if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
+                break;
+            }
+
+            unset( $files[ $i ] );
+            @unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+        }
+
+        // Calculate the size.
+        $total_size = array_reduce( $files, function ( $carry, $item ) {
+
+            return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
+        }, 0 );
+
+
+        // Remove files until we're within the max size.
+        while ( $total_size > $this->max_size ) {
+            $file       = array_shift( $files );
+            $total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
+            @unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+        }
+
+        // Send back some stats.
+        wp_send_json_success( array(
+            'initial_count' => $original_count,
+            'current_count' => count( $files ),
+            'current_size'  => $total_size,
+        ) );
+    }
+
+    private function reduce( $accumulator, $path ) {
+
+        /**
+         * Bail out if the path doesn't exist.
+         *
+         * Avoid warnings when trying to open a path which doesn't exist.
+         *
+         * @since 3.23.0
+         * @see https://github.com/insideout10/wordlift-plugin/issues/966
+         */
+        if ( ! file_exists( $path ) ) {
+            return $accumulator;
+        }
+
+        // Open the dir handle.
+        $handle = opendir( $path );
+
+        // Catch exceptions to be sure to close the dir handle.
+        try {
+            $accumulator = @$this->_reduce( $accumulator, $path, $handle );
+        } catch ( Exception $e ) {
+            // Do nothing.
+        }
+
+        // Finally close the directory handle.
+        closedir( $handle );
+
+        return $accumulator;
+    }
+
+    /**
+     * @param $accumulator
+     * @param $path
+     * @param $handle
+     *
+     * @return array
+     */
+    private function _reduce( $accumulator, $path, $handle ) {
+
+        while ( false !== ( $entry = readdir( $handle ) ) ) {
+
+            // Skip to the next one.
+            if ( 0 === strpos( $entry, '.' ) ) {
+                continue;
+            }
+
+            // Set the full path to the entry.
+            $entry_path = $path . DIRECTORY_SEPARATOR . $entry;
+
+            // Handle directories.
+            if ( is_dir( $entry_path ) ) {
+                $accumulator = $this->reduce( $accumulator, $entry_path );
+
+                continue;
+            }
+
+            // Store the file data.
+            $accumulator[] = array(
+                $entry_path,
+                filemtime( $entry_path ),
+                filesize( $entry_path ),
+            );
+        }
+
+        return $accumulator;
+    }
 
 }

Spacing +51 added lines, -51 removed lines

@@ -16,8 +16,8 @@ 
 
 use Exception;
 
-defined( 'WORDLIFT_CACHE_DEFAULT_TTL' ) || define( 'WORDLIFT_CACHE_DEFAULT_TTL', 86400 );  // 24 hours
-defined( 'WORDLIFT_CACHE_DEFAULT_MAX_SIZE' ) || define( 'WORDLIFT_CACHE_DEFAULT_MAX_SIZE', 104857600 ); // 100 M
+defined('WORDLIFT_CACHE_DEFAULT_TTL') || define('WORDLIFT_CACHE_DEFAULT_TTL', 86400); // 24 hours
+defined('WORDLIFT_CACHE_DEFAULT_MAX_SIZE') || define('WORDLIFT_CACHE_DEFAULT_MAX_SIZE', 104857600); // 100 M
 
 class Ttl_Cache_Cleaner {
 
@@ -47,101 +47,101 @@ 
 	 * @param int $ttl The max TTL in seconds.
 	 * @param int $max_size The max size in bytes.
 	 */
-	public function __construct( $ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE ) {
+	public function __construct($ttl = WORDLIFT_CACHE_DEFAULT_TTL, $max_size = WORDLIFT_CACHE_DEFAULT_MAX_SIZE) {
 
 		$this->ttl      = $ttl;
 		$this->max_size = $max_size;
 
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
-		add_action( 'wl_ttl_cache_cleaner__flush', array( $this, 'flush' ) );
+		add_action('wp_ajax_wl_ttl_cache_cleaner__flush', array($this, 'flush'));
+		add_action('wl_ttl_cache_cleaner__flush', array($this, 'flush'));
 
-		add_action( 'wp_ajax_wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
-		add_action( 'wl_ttl_cache_cleaner__cleanup', array( $this, 'cleanup' ) );
+		add_action('wp_ajax_wl_ttl_cache_cleaner__cleanup', array($this, 'cleanup'));
+		add_action('wl_ttl_cache_cleaner__cleanup', array($this, 'cleanup'));
 
 		// Do not bother to configure scheduled tasks while running on the front-end.
-		if ( is_admin() && ! wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' ) ) {
-			wp_schedule_event( time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup' );
+		if (is_admin() && ! wp_next_scheduled('wl_ttl_cache_cleaner__cleanup')) {
+			wp_schedule_event(time(), 'hourly', 'wl_ttl_cache_cleaner__cleanup');
 		}
 
 	}
 
 	public static function deactivate() {
 
-		$timestamp = wp_next_scheduled( 'wl_ttl_cache_cleaner__cleanup' );
-		wp_unschedule_event( $timestamp, 'wl_ttl_cache_cleaner__cleanup' );
+		$timestamp = wp_next_scheduled('wl_ttl_cache_cleaner__cleanup');
+		wp_unschedule_event($timestamp, 'wl_ttl_cache_cleaner__cleanup');
 
 	}
 
 	public function flush() {
 
 		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+		$files = $this->reduce(array(), Ttl_Cache::get_cache_folder());
 
-		foreach ( $files as $file ) {
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+		foreach ($files as $file) {
+			@unlink($file[Ttl_Cache_Cleaner::PATH]);
 		}
 
-		$action = isset( $_REQUEST['action'] ) ? sanitize_text_field( wp_unslash( (string) $_REQUEST['action'] ) ) : '';
-		if ( defined( 'DOING_AJAX' ) && DOING_AJAX && 'wl_ttl_cache_cleaner__flush' === $action ) {
-			wp_send_json_success( count( $files ) );
+		$action = isset($_REQUEST['action']) ? sanitize_text_field(wp_unslash((string) $_REQUEST['action'])) : '';
+		if (defined('DOING_AJAX') && DOING_AJAX && 'wl_ttl_cache_cleaner__flush' === $action) {
+			wp_send_json_success(count($files));
 		}
 	}
 
 	public function cleanup() {
 
 		// Get all the files, recursive.
-		$files = $this->reduce( array(), Ttl_Cache::get_cache_folder() );
+		$files = $this->reduce(array(), Ttl_Cache::get_cache_folder());
 
 		// Get the max mtime.
 		$max_mtime = time() - WORDLIFT_CACHE_DEFAULT_TTL;
 
 		// Keep the original count for statistics that we're going to send the client.
-		$original_count = count( $files );
+		$original_count = count($files);
 
 		// Sort by size ascending.
-		usort( $files, function ( $f1, $f2 ) {
-			if ( $f1[ Ttl_Cache_Cleaner::MTIME ] === $f2[ Ttl_Cache_Cleaner::MTIME ] ) {
+		usort($files, function($f1, $f2) {
+			if ($f1[Ttl_Cache_Cleaner::MTIME] === $f2[Ttl_Cache_Cleaner::MTIME]) {
 				return 0;
 			}
 
-			return ( $f1[ Ttl_Cache_Cleaner::MTIME ] < $f2[ Ttl_Cache_Cleaner::MTIME ] ) ? - 1 : 1;
+			return ($f1[Ttl_Cache_Cleaner::MTIME] < $f2[Ttl_Cache_Cleaner::MTIME]) ? -1 : 1;
 		} );
 
 		// Start removing stale files.
-		for ( $i = 0; $i < count( $files ); $i ++ ) {
-			$file = $files[ $i ];
+		for ($i = 0; $i < count($files); $i++) {
+			$file = $files[$i];
 			// Break if the mtime is within the range.
-			if ( $file[ Ttl_Cache_Cleaner::MTIME ] > $max_mtime ) {
+			if ($file[Ttl_Cache_Cleaner::MTIME] > $max_mtime) {
 				break;
 			}
 
-			unset( $files[ $i ] );
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+			unset($files[$i]);
+			@unlink($file[Ttl_Cache_Cleaner::PATH]);
 		}
 
 		// Calculate the size.
-		$total_size = array_reduce( $files, function ( $carry, $item ) {
+		$total_size = array_reduce($files, function($carry, $item) {
 
-			return $carry + $item[ Ttl_Cache_Cleaner::SIZE ];
-		}, 0 );
+			return $carry + $item[Ttl_Cache_Cleaner::SIZE];
+		}, 0);
 
 
 		// Remove files until we're within the max size.
-		while ( $total_size > $this->max_size ) {
-			$file       = array_shift( $files );
-			$total_size -= $file[ Ttl_Cache_Cleaner::SIZE ];
-			@unlink( $file[ Ttl_Cache_Cleaner::PATH ] );
+		while ($total_size > $this->max_size) {
+			$file = array_shift($files);
+			$total_size -= $file[Ttl_Cache_Cleaner::SIZE];
+			@unlink($file[Ttl_Cache_Cleaner::PATH]);
 		}
 
 		// Send back some stats.
-		wp_send_json_success( array(
+		wp_send_json_success(array(
 			'initial_count' => $original_count,
-			'current_count' => count( $files ),
+			'current_count' => count($files),
 			'current_size'  => $total_size,
-		) );
+		));
 	}
 
-	private function reduce( $accumulator, $path ) {
+	private function reduce($accumulator, $path) {
 
 		/**
 		 * Bail out if the path doesn't exist.
@@ -151,22 +151,22 @@ 
 		 * @since 3.23.0
 		 * @see https://github.com/insideout10/wordlift-plugin/issues/966
 		 */
-		if ( ! file_exists( $path ) ) {
+		if ( ! file_exists($path)) {
 			return $accumulator;
 		}
 
 		// Open the dir handle.
-		$handle = opendir( $path );
+		$handle = opendir($path);
 
 		// Catch exceptions to be sure to close the dir handle.
 		try {
-			$accumulator = @$this->_reduce( $accumulator, $path, $handle );
-		} catch ( Exception $e ) {
+			$accumulator = @$this->_reduce($accumulator, $path, $handle);
+		} catch (Exception $e) {
 			// Do nothing.
 		}
 
 		// Finally close the directory handle.
-		closedir( $handle );
+		closedir($handle);
 
 		return $accumulator;
 	}
@@ -178,21 +178,21 @@ 
 	 *
 	 * @return array
 	 */
-	private function _reduce( $accumulator, $path, $handle ) {
+	private function _reduce($accumulator, $path, $handle) {
 
-		while ( false !== ( $entry = readdir( $handle ) ) ) {
+		while (false !== ($entry = readdir($handle))) {
 
 			// Skip to the next one.
-			if ( 0 === strpos( $entry, '.' ) ) {
+			if (0 === strpos($entry, '.')) {
 				continue;
 			}
 
 			// Set the full path to the entry.
-			$entry_path = $path . DIRECTORY_SEPARATOR . $entry;
+			$entry_path = $path.DIRECTORY_SEPARATOR.$entry;
 
 			// Handle directories.
-			if ( is_dir( $entry_path ) ) {
-				$accumulator = $this->reduce( $accumulator, $entry_path );
+			if (is_dir($entry_path)) {
+				$accumulator = $this->reduce($accumulator, $entry_path);
 
 				continue;
 			}
@@ -200,8 +200,8 @@ 
 			// Store the file data.
 			$accumulator[] = array(
 				$entry_path,
-				filemtime( $entry_path ),
-				filesize( $entry_path ),
+				filemtime($entry_path),
+				filesize($entry_path),
 			);
 		}