pryley / site-reviews

plugin/Controllers/PublicController.php

Indentation +82 added lines, -82 removed lines

@@ -13,93 +13,93 @@
 
 class PublicController extends Controller
 {
-    /**
-     * @return void
-     * @action wp_enqueue_scripts
-     */
-    public function enqueueAssets()
-    {
-        (new EnqueuePublicAssets())->handle();
-    }
+	/**
+	 * @return void
+	 * @action wp_enqueue_scripts
+	 */
+	public function enqueueAssets()
+	{
+		(new EnqueuePublicAssets())->handle();
+	}
 
-    /**
-     * @param string $tag
-     * @param string $handle
-     * @return string
-     * @filter script_loader_tag
-     */
-    public function filterEnqueuedScripts($tag, $handle)
-    {
-        $scripts = [Application::ID.'/google-recaptcha'];
-        if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' async src=', $tag);
-        }
-        if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
-            $tag = str_replace(' src=', ' defer src=', $tag);
-        }
-        return $tag;
-    }
+	/**
+	 * @param string $tag
+	 * @param string $handle
+	 * @return string
+	 * @filter script_loader_tag
+	 */
+	public function filterEnqueuedScripts($tag, $handle)
+	{
+		$scripts = [Application::ID.'/google-recaptcha'];
+		if (in_array($handle, apply_filters('site-reviews/async-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' async src=', $tag);
+		}
+		if (in_array($handle, apply_filters('site-reviews/defer-scripts', $scripts))) {
+			$tag = str_replace(' src=', ' defer src=', $tag);
+		}
+		return $tag;
+	}
 
-    /**
-     * @return array
-     * @filter site-reviews/config/forms/submission-form
-     */
-    public function filterFieldOrder(array $config)
-    {
-        $order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
-        return array_intersect_key(array_merge(array_flip($order), $config), $config);
-    }
+	/**
+	 * @return array
+	 * @filter site-reviews/config/forms/submission-form
+	 */
+	public function filterFieldOrder(array $config)
+	{
+		$order = (array) apply_filters('site-reviews/submission-form/order', array_keys($config));
+		return array_intersect_key(array_merge(array_flip($order), $config), $config);
+	}
 
-    /**
-     * @param array $vars
-     * @return array
-     * @filter query_vars
-     */
-    public function filterQueryVars($vars)
-    {
-        $vars = Arr::consolidateArray($vars);
-        $vars[] = glsr()->constant('PAGED_QUERY_VAR');
-        return $vars;
-    }
+	/**
+	 * @param array $vars
+	 * @return array
+	 * @filter query_vars
+	 */
+	public function filterQueryVars($vars)
+	{
+		$vars = Arr::consolidateArray($vars);
+		$vars[] = glsr()->constant('PAGED_QUERY_VAR');
+		return $vars;
+	}
 
-    /**
-     * @param string $view
-     * @return string
-     * @filter site-reviews/render/view
-     */
-    public function filterRenderView($view)
-    {
-        return glsr(Style::class)->filterView($view);
-    }
+	/**
+	 * @param string $view
+	 * @return string
+	 * @filter site-reviews/render/view
+	 */
+	public function filterRenderView($view)
+	{
+		return glsr(Style::class)->filterView($view);
+	}
 
-    /**
-     * @return void
-     * @action site-reviews/builder
-     */
-    public function modifyBuilder(Builder $instance)
-    {
-        call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
-    }
+	/**
+	 * @return void
+	 * @action site-reviews/builder
+	 */
+	public function modifyBuilder(Builder $instance)
+	{
+		call_user_func_array([glsr(Style::class), 'modifyField'], [$instance]);
+	}
 
-    /**
-     * @return void
-     * @action wp_footer
-     */
-    public function renderSchema()
-    {
-        glsr(Schema::class)->render();
-    }
+	/**
+	 * @return void
+	 * @action wp_footer
+	 */
+	public function renderSchema()
+	{
+		glsr(Schema::class)->render();
+	}
 
-    /**
-     * @return CreateReview
-     */
-    public function routerSubmitReview(array $request)
-    {
-        $validated = glsr(ValidateReview::class)->validate($request);
-        $command = new CreateReview($validated->request);
-        if (empty($validated->error) && !$validated->recaptchaIsUnset) {
-            $this->execute($command);
-        }
-        return $command;
-    }
+	/**
+	 * @return CreateReview
+	 */
+	public function routerSubmitReview(array $request)
+	{
+		$validated = glsr(ValidateReview::class)->validate($request);
+		$command = new CreateReview($validated->request);
+		if (empty($validated->error) && !$validated->recaptchaIsUnset) {
+			$this->execute($command);
+		}
+		return $command;
+	}
 }

plugin/Controllers/EditorController.php

Indentation +403 added lines, -403 removed lines

@@ -19,434 +19,434 @@
 
 class EditorController extends Controller
 {
-    /**
-     * @return void
-     * @action admin_enqueue_scripts
-     */
-    public function customizePostStatusLabels()
-    {
-        glsr(Labels::class)->customizePostStatusLabels();
-    }
+	/**
+	 * @return void
+	 * @action admin_enqueue_scripts
+	 */
+	public function customizePostStatusLabels()
+	{
+		glsr(Labels::class)->customizePostStatusLabels();
+	}
 
-    /**
-     * @param array $settings
-     * @return array
-     * @filter wp_editor_settings
-     */
-    public function filterEditorSettings($settings)
-    {
-        return glsr(Customization::class)->filterEditorSettings(
-            Arr::consolidateArray($settings)
-        );
-    }
+	/**
+	 * @param array $settings
+	 * @return array
+	 * @filter wp_editor_settings
+	 */
+	public function filterEditorSettings($settings)
+	{
+		return glsr(Customization::class)->filterEditorSettings(
+			Arr::consolidateArray($settings)
+		);
+	}
 
-    /**
-     * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script.
-     * @param string $html
-     * @return string
-     * @filter the_editor
-     */
-    public function filterEditorTextarea($html)
-    {
-        return glsr(Customization::class)->filterEditorTextarea($html);
-    }
+	/**
+	 * Modify the WP_Editor html to allow autosizing without breaking the `editor-expand` script.
+	 * @param string $html
+	 * @return string
+	 * @filter the_editor
+	 */
+	public function filterEditorTextarea($html)
+	{
+		return glsr(Customization::class)->filterEditorTextarea($html);
+	}
 
-    /**
-     * @param bool $protected
-     * @param string $metaKey
-     * @param string $metaType
-     * @return bool
-     * @filter is_protected_meta
-     */
-    public function filterIsProtectedMeta($protected, $metaKey, $metaType)
-    {
-        if ('post' == $metaType && Application::POST_TYPE == get_post_type()) {
-            $values = glsr(CreateReviewDefaults::class)->unguarded();
-            $values = Arr::prefixArrayKeys($values);
-            if (array_key_exists($metaKey, $values)) {
-                $protected = false;
-            }
-        }
-        return $protected;
-    }
+	/**
+	 * @param bool $protected
+	 * @param string $metaKey
+	 * @param string $metaType
+	 * @return bool
+	 * @filter is_protected_meta
+	 */
+	public function filterIsProtectedMeta($protected, $metaKey, $metaType)
+	{
+		if ('post' == $metaType && Application::POST_TYPE == get_post_type()) {
+			$values = glsr(CreateReviewDefaults::class)->unguarded();
+			$values = Arr::prefixArrayKeys($values);
+			if (array_key_exists($metaKey, $values)) {
+				$protected = false;
+			}
+		}
+		return $protected;
+	}
 
-    /**
-     * @param string $translation
-     * @param string $test
-     * @param string $domain
-     * @return string
-     * @filter gettext
-     */
-    public function filterPostStatusLabels($translation, $text, $domain)
-    {
-        return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $test
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext
+	 */
+	public function filterPostStatusLabels($translation, $text, $domain)
+	{
+		return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
+	}
 
-    /**
-     * @param string $translation
-     * @param string $test
-     * @param string $domain
-     * @return string
-     * @filter gettext_with_context
-     */
-    public function filterPostStatusLabelsWithContext($translation, $text, $context, $domain)
-    {
-        return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
-    }
+	/**
+	 * @param string $translation
+	 * @param string $test
+	 * @param string $domain
+	 * @return string
+	 * @filter gettext_with_context
+	 */
+	public function filterPostStatusLabelsWithContext($translation, $text, $context, $domain)
+	{
+		return glsr(Labels::class)->filterPostStatusLabels($translation, $text, $domain);
+	}
 
-    /**
-     * @param array $messages
-     * @return array
-     * @filter post_updated_messages
-     */
-    public function filterUpdateMessages($messages)
-    {
-        return glsr(Labels::class)->filterUpdateMessages(
-            Arr::consolidateArray($messages)
-        );
-    }
+	/**
+	 * @param array $messages
+	 * @return array
+	 * @filter post_updated_messages
+	 */
+	public function filterUpdateMessages($messages)
+	{
+		return glsr(Labels::class)->filterUpdateMessages(
+			Arr::consolidateArray($messages)
+		);
+	}
 
-    /**
-     * @return void
-     * @action add_meta_boxes_{Application::POST_TYPE}
-     */
-    public function registerMetaBoxes($post)
-    {
-        add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side');
-        add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side');
-        if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) {
-            return;
-        }
-        add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal');
-    }
+	/**
+	 * @return void
+	 * @action add_meta_boxes_{Application::POST_TYPE}
+	 */
+	public function registerMetaBoxes($post)
+	{
+		add_meta_box(Application::ID.'_assigned_to', __('Assigned To', 'site-reviews'), [$this, 'renderAssignedToMetabox'], null, 'side');
+		add_meta_box(Application::ID.'_review', __('Details', 'site-reviews'), [$this, 'renderDetailsMetaBox'], null, 'side');
+		if ('local' != glsr(Database::class)->get($post->ID, 'review_type')) {
+			return;
+		}
+		add_meta_box(Application::ID.'_response', __('Respond Publicly', 'site-reviews'), [$this, 'renderResponseMetaBox'], null, 'normal');
+	}
 
-    /**
-     * @return void
-     * @action admin_print_scripts
-     */
-    public function removeAutosave()
-    {
-        glsr(Customization::class)->removeAutosave();
-    }
+	/**
+	 * @return void
+	 * @action admin_print_scripts
+	 */
+	public function removeAutosave()
+	{
+		glsr(Customization::class)->removeAutosave();
+	}
 
-    /**
-     * @return void
-     * @action admin_menu
-     */
-    public function removeMetaBoxes()
-    {
-        glsr(Customization::class)->removeMetaBoxes();
-    }
+	/**
+	 * @return void
+	 * @action admin_menu
+	 */
+	public function removeMetaBoxes()
+	{
+		glsr(Customization::class)->removeMetaBoxes();
+	}
 
-    /**
-     * @return void
-     */
-    public function removePostTypeSupport()
-    {
-        glsr(Customization::class)->removePostTypeSupport();
-    }
+	/**
+	 * @return void
+	 */
+	public function removePostTypeSupport()
+	{
+		glsr(Customization::class)->removePostTypeSupport();
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderAssignedToMetabox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        $assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to');
-        wp_nonce_field('assigned_to', '_nonce-assigned-to', false);
-        glsr()->render('partials/editor/metabox-assigned-to', [
-            'id' => $assignedTo,
-            'template' => $this->buildAssignedToTemplate($assignedTo, $post),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderAssignedToMetabox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		$assignedTo = (string) glsr(Database::class)->get($post->ID, 'assigned_to');
+		wp_nonce_field('assigned_to', '_nonce-assigned-to', false);
+		glsr()->render('partials/editor/metabox-assigned-to', [
+			'id' => $assignedTo,
+			'template' => $this->buildAssignedToTemplate($assignedTo, $post),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderDetailsMetaBox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        $review = glsr_get_review($post);
-        glsr()->render('partials/editor/metabox-details', [
-            'button' => $this->buildDetailsMetaBoxRevertButton($review, $post),
-            'metabox' => $this->normalizeDetailsMetaBox($review),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderDetailsMetaBox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		$review = glsr_get_review($post);
+		glsr()->render('partials/editor/metabox-details', [
+			'button' => $this->buildDetailsMetaBoxRevertButton($review, $post),
+			'metabox' => $this->normalizeDetailsMetaBox($review),
+		]);
+	}
 
-    /**
-     * @return void
-     * @action post_submitbox_misc_actions
-     */
-    public function renderPinnedInPublishMetaBox()
-    {
-        if (!$this->isReviewPostType(get_post())) {
-            return;
-        }
-        glsr(Template::class)->render('partials/editor/pinned', [
-            'context' => [
-                'no' => __('No', 'site-reviews'),
-                'yes' => __('Yes', 'site-reviews'),
-            ],
-            'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')),
-        ]);
-    }
+	/**
+	 * @return void
+	 * @action post_submitbox_misc_actions
+	 */
+	public function renderPinnedInPublishMetaBox()
+	{
+		if (!$this->isReviewPostType(get_post())) {
+			return;
+		}
+		glsr(Template::class)->render('partials/editor/pinned', [
+			'context' => [
+				'no' => __('No', 'site-reviews'),
+				'yes' => __('Yes', 'site-reviews'),
+			],
+			'pinned' => wp_validate_boolean(glsr(Database::class)->get(get_the_ID(), 'pinned')),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @callback add_meta_box
-     */
-    public function renderResponseMetaBox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        wp_nonce_field('response', '_nonce-response', false);
-        glsr()->render('partials/editor/metabox-response', [
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @callback add_meta_box
+	 */
+	public function renderResponseMetaBox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		wp_nonce_field('response', '_nonce-response', false);
+		glsr()->render('partials/editor/metabox-response', [
+			'response' => glsr(Database::class)->get($post->ID, 'response'),
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @action edit_form_after_title
-     */
-    public function renderReviewEditor($post)
-    {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
-            return;
-        }
-        glsr()->render('partials/editor/review', [
-            'post' => $post,
-            'response' => glsr(Database::class)->get($post->ID, 'response'),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @action edit_form_after_title
+	 */
+	public function renderReviewEditor($post)
+	{
+		if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+			return;
+		}
+		glsr()->render('partials/editor/review', [
+			'post' => $post,
+			'response' => glsr(Database::class)->get($post->ID, 'response'),
+		]);
+	}
 
-    /**
-     * @return void
-     * @action admin_head
-     */
-    public function renderReviewFields()
-    {
-        $screen = glsr_current_screen();
-        if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) {
-            return;
-        }
-        add_action('edit_form_after_title', [$this, 'renderReviewEditor']);
-        add_action('edit_form_top', [$this, 'renderReviewNotice']);
-    }
+	/**
+	 * @return void
+	 * @action admin_head
+	 */
+	public function renderReviewFields()
+	{
+		$screen = glsr_current_screen();
+		if ('post' != $screen->base || Application::POST_TYPE != $screen->post_type) {
+			return;
+		}
+		add_action('edit_form_after_title', [$this, 'renderReviewEditor']);
+		add_action('edit_form_top', [$this, 'renderReviewNotice']);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @action edit_form_top
-     */
-    public function renderReviewNotice($post)
-    {
-        if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
-            return;
-        }
-        glsr(Notice::class)->addWarning(sprintf(
-            __('%s reviews are read-only.', 'site-reviews'),
-            glsr(Columns::class)->buildColumnReviewType($post->ID)
-        ));
-        glsr(Template::class)->render('partials/editor/notice', [
-            'context' => [
-                'notices' => glsr(Notice::class)->get(),
-            ],
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @action edit_form_top
+	 */
+	public function renderReviewNotice($post)
+	{
+		if (!$this->isReviewPostType($post) || $this->isReviewEditable($post)) {
+			return;
+		}
+		glsr(Notice::class)->addWarning(sprintf(
+			__('%s reviews are read-only.', 'site-reviews'),
+			glsr(Columns::class)->buildColumnReviewType($post->ID)
+		));
+		glsr(Template::class)->render('partials/editor/notice', [
+			'context' => [
+				'notices' => glsr(Notice::class)->get(),
+			],
+		]);
+	}
 
-    /**
-     * @param WP_Post $post
-     * @return void
-     * @see glsr_categories_meta_box()
-     * @callback register_taxonomy
-     */
-    public function renderTaxonomyMetabox($post)
-    {
-        if (!$this->isReviewPostType($post)) {
-            return;
-        }
-        glsr()->render('partials/editor/metabox-categories', [
-            'post' => $post,
-            'tax_name' => Application::TAXONOMY,
-            'taxonomy' => get_taxonomy(Application::TAXONOMY),
-        ]);
-    }
+	/**
+	 * @param WP_Post $post
+	 * @return void
+	 * @see glsr_categories_meta_box()
+	 * @callback register_taxonomy
+	 */
+	public function renderTaxonomyMetabox($post)
+	{
+		if (!$this->isReviewPostType($post)) {
+			return;
+		}
+		glsr()->render('partials/editor/metabox-categories', [
+			'post' => $post,
+			'tax_name' => Application::TAXONOMY,
+			'taxonomy' => get_taxonomy(Application::TAXONOMY),
+		]);
+	}
 
-    /**
-     * @return void
-     * @see $this->filterUpdateMessages()
-     * @action admin_action_revert
-     */
-    public function revertReview()
-    {
-        if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
-            return;
-        }
-        check_admin_referer('revert-review_'.($postId = $this->getPostId()));
-        glsr(ReviewManager::class)->revert($postId);
-        $this->redirect($postId, 52);
-    }
+	/**
+	 * @return void
+	 * @see $this->filterUpdateMessages()
+	 * @action admin_action_revert
+	 */
+	public function revertReview()
+	{
+		if (Application::ID != filter_input(INPUT_GET, 'plugin')) {
+			return;
+		}
+		check_admin_referer('revert-review_'.($postId = $this->getPostId()));
+		glsr(ReviewManager::class)->revert($postId);
+		$this->redirect($postId, 52);
+	}
 
-    /**
-     * @param int $postId
-     * @param \WP_Post $post
-     * @param bool $isUpdate
-     * @return void
-     * @action save_post_.Application::POST_TYPE
-     */
-    public function saveMetaboxes($postId, $post, $isUpdating)
-    {
-        glsr(Metaboxes::class)->saveAssignedToMetabox($postId);
-        glsr(Metaboxes::class)->saveResponseMetabox($postId);
-        if ($isUpdating) {
-            do_action('site-reviews/review/saved', glsr_get_review($postId));
-        }
-    }
+	/**
+	 * @param int $postId
+	 * @param \WP_Post $post
+	 * @param bool $isUpdate
+	 * @return void
+	 * @action save_post_.Application::POST_TYPE
+	 */
+	public function saveMetaboxes($postId, $post, $isUpdating)
+	{
+		glsr(Metaboxes::class)->saveAssignedToMetabox($postId);
+		glsr(Metaboxes::class)->saveResponseMetabox($postId);
+		if ($isUpdating) {
+			do_action('site-reviews/review/saved', glsr_get_review($postId));
+		}
+	}
 
-    /**
-     * @param string $assignedTo
-     * @return string
-     */
-    protected function buildAssignedToTemplate($assignedTo, WP_Post $post)
-    {
-        $assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo);
-        if (!($assignedPost instanceof WP_Post)) {
-            return;
-        }
-        return glsr(Template::class)->build('partials/editor/assigned-post', [
-            'context' => [
-                'data.url' => (string) get_permalink($assignedPost),
-                'data.title' => get_the_title($assignedPost),
-            ],
-        ]);
-    }
+	/**
+	 * @param string $assignedTo
+	 * @return string
+	 */
+	protected function buildAssignedToTemplate($assignedTo, WP_Post $post)
+	{
+		$assignedPost = glsr(Database::class)->getAssignedToPost($post->ID, $assignedTo);
+		if (!($assignedPost instanceof WP_Post)) {
+			return;
+		}
+		return glsr(Template::class)->build('partials/editor/assigned-post', [
+			'context' => [
+				'data.url' => (string) get_permalink($assignedPost),
+				'data.title' => get_the_title($assignedPost),
+			],
+		]);
+	}
 
-    /**
-     * @return string
-     */
-    protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post)
-    {
-        $isModified = !Arr::compareArrays(
-            [$review->title, $review->content, $review->date],
-            [
-                glsr(Database::class)->get($post->ID, 'title'),
-                glsr(Database::class)->get($post->ID, 'content'),
-                glsr(Database::class)->get($post->ID, 'date'),
-            ]
-        );
-        if ($isModified) {
-            $revertUrl = wp_nonce_url(
-                admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID),
-                'revert-review_'.$post->ID
-            );
-            return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [
-                'class' => 'button button-large',
-                'href' => $revertUrl,
-                'id' => 'revert',
-            ]);
-        }
-        return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [
-            'class' => 'button-large',
-            'disabled' => true,
-            'id' => 'revert',
-        ]);
-    }
+	/**
+	 * @return string
+	 */
+	protected function buildDetailsMetaBoxRevertButton(Review $review, WP_Post $post)
+	{
+		$isModified = !Arr::compareArrays(
+			[$review->title, $review->content, $review->date],
+			[
+				glsr(Database::class)->get($post->ID, 'title'),
+				glsr(Database::class)->get($post->ID, 'content'),
+				glsr(Database::class)->get($post->ID, 'date'),
+			]
+		);
+		if ($isModified) {
+			$revertUrl = wp_nonce_url(
+				admin_url('post.php?post='.$post->ID.'&action=revert&plugin='.Application::ID),
+				'revert-review_'.$post->ID
+			);
+			return glsr(Builder::class)->a(__('Revert Changes', 'site-reviews'), [
+				'class' => 'button button-large',
+				'href' => $revertUrl,
+				'id' => 'revert',
+			]);
+		}
+		return glsr(Builder::class)->button(__('Nothing to Revert', 'site-reviews'), [
+			'class' => 'button-large',
+			'disabled' => true,
+			'id' => 'revert',
+		]);
+	}
 
-    /**
-     * @param object $review
-     * @return string|void
-     */
-    protected function getReviewType($review)
-    {
-        if (count(glsr()->reviewTypes) < 2) {
-            return;
-        }
-        $reviewType = array_key_exists($review->review_type, glsr()->reviewTypes)
-            ? glsr()->reviewTypes[$review->review_type]
-            : __('Unknown', 'site-reviews');
-        if (!empty($review->url)) {
-            $reviewType = glsr(Builder::class)->a($reviewType, [
-                'href' => $review->url,
-                'target' => '_blank',
-            ]);
-        }
-        return $reviewType;
-    }
+	/**
+	 * @param object $review
+	 * @return string|void
+	 */
+	protected function getReviewType($review)
+	{
+		if (count(glsr()->reviewTypes) < 2) {
+			return;
+		}
+		$reviewType = array_key_exists($review->review_type, glsr()->reviewTypes)
+			? glsr()->reviewTypes[$review->review_type]
+			: __('Unknown', 'site-reviews');
+		if (!empty($review->url)) {
+			$reviewType = glsr(Builder::class)->a($reviewType, [
+				'href' => $review->url,
+				'target' => '_blank',
+			]);
+		}
+		return $reviewType;
+	}
 
-    /**
-     * @return bool
-     */
-    protected function isReviewEditable($post)
-    {
-        return $this->isReviewPostType($post)
-            && post_type_supports(Application::POST_TYPE, 'title')
-            && 'local' == glsr(Database::class)->get($post->ID, 'review_type');
-    }
+	/**
+	 * @return bool
+	 */
+	protected function isReviewEditable($post)
+	{
+		return $this->isReviewPostType($post)
+			&& post_type_supports(Application::POST_TYPE, 'title')
+			&& 'local' == glsr(Database::class)->get($post->ID, 'review_type');
+	}
 
-    /**
-     * @param mixed $post
-     * @return bool
-     */
-    protected function isReviewPostType($post)
-    {
-        return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type;
-    }
+	/**
+	 * @param mixed $post
+	 * @return bool
+	 */
+	protected function isReviewPostType($post)
+	{
+		return $post instanceof WP_Post && Application::POST_TYPE == $post->post_type;
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalizeDetailsMetaBox(Review $review)
-    {
-        $user = empty($review->user_id)
-            ? __('Unregistered user', 'site-reviews')
-            : glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [
-                'href' => get_author_posts_url($review->user_id),
-            ]);
-        $email = empty($review->email)
-            ? '&mdash;'
-            : glsr(Builder::class)->a($review->email, [
-                'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title),
-            ]);
-        $metabox = [
-            __('Rating', 'site-reviews') => glsr_star_rating($review->rating),
-            __('Type', 'site-reviews') => $this->getReviewType($review),
-            __('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'),
-            __('Name', 'site-reviews') => $review->author,
-            __('Email', 'site-reviews') => $email,
-            __('User', 'site-reviews') => $user,
-            __('IP Address', 'site-reviews') => $review->ip_address,
-            __('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar),
-        ];
-        return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review));
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalizeDetailsMetaBox(Review $review)
+	{
+		$user = empty($review->user_id)
+			? __('Unregistered user', 'site-reviews')
+			: glsr(Builder::class)->a(get_the_author_meta('display_name', $review->user_id), [
+				'href' => get_author_posts_url($review->user_id),
+			]);
+		$email = empty($review->email)
+			? '&mdash;'
+			: glsr(Builder::class)->a($review->email, [
+				'href' => 'mailto:'.$review->email.'?subject='.esc_attr(__('RE:', 'site-reviews').' '.$review->title),
+			]);
+		$metabox = [
+			__('Rating', 'site-reviews') => glsr_star_rating($review->rating),
+			__('Type', 'site-reviews') => $this->getReviewType($review),
+			__('Date', 'site-reviews') => get_date_from_gmt($review->date, 'F j, Y'),
+			__('Name', 'site-reviews') => $review->author,
+			__('Email', 'site-reviews') => $email,
+			__('User', 'site-reviews') => $user,
+			__('IP Address', 'site-reviews') => $review->ip_address,
+			__('Avatar', 'site-reviews') => sprintf('<img src="%s" width="96">', $review->avatar),
+		];
+		return array_filter(apply_filters('site-reviews/metabox/details', $metabox, $review));
+	}
 
-    /**
-     * @param int $postId
-     * @param int $messageIndex
-     * @return void
-     */
-    protected function redirect($postId, $messageIndex)
-    {
-        $referer = wp_get_referer();
-        $hasReferer = !$referer
-            || false !== strpos($referer, 'post.php')
-            || false !== strpos($referer, 'post-new.php');
-        $redirectUri = $hasReferer
-            ? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer)
-            : get_edit_post_link($postId);
-        wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri));
-        exit;
-    }
+	/**
+	 * @param int $postId
+	 * @param int $messageIndex
+	 * @return void
+	 */
+	protected function redirect($postId, $messageIndex)
+	{
+		$referer = wp_get_referer();
+		$hasReferer = !$referer
+			|| false !== strpos($referer, 'post.php')
+			|| false !== strpos($referer, 'post-new.php');
+		$redirectUri = $hasReferer
+			? remove_query_arg(['deleted', 'ids', 'trashed', 'untrashed'], $referer)
+			: get_edit_post_link($postId);
+		wp_safe_redirect(add_query_arg(['message' => $messageIndex], $redirectUri));
+		exit;
+	}
 }

plugin/Controllers/ListTableController/Columns.php

Indentation +129 added lines, -129 removed lines

@@ -10,141 +10,141 @@
 
 class Columns
 {
-    /**
-     * @param int $postId
-     * @return string
-     */
-    public function buildColumnAssignedTo($postId)
-    {
-        $assignedPost = glsr(Database::class)->getAssignedToPost($postId);
-        $column = '—';
-        if ($assignedPost instanceof WP_Post && 'publish' == $assignedPost->post_status) {
-            $column = glsr(Builder::class)->a(get_the_title($assignedPost->ID), [
-                'href' => (string) get_the_permalink($assignedPost->ID),
-            ]);
-        }
-        return $column;
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	public function buildColumnAssignedTo($postId)
+	{
+		$assignedPost = glsr(Database::class)->getAssignedToPost($postId);
+		$column = '—';
+		if ($assignedPost instanceof WP_Post && 'publish' == $assignedPost->post_status) {
+			$column = glsr(Builder::class)->a(get_the_title($assignedPost->ID), [
+				'href' => (string) get_the_permalink($assignedPost->ID),
+			]);
+		}
+		return $column;
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    public function buildColumnPinned($postId)
-    {
-        $pinned = glsr(Database::class)->get($postId, 'pinned')
-            ? 'pinned '
-            : '';
-        return glsr(Builder::class)->i([
-            'class' => $pinned.'dashicons dashicons-sticky',
-            'data-id' => $postId,
-        ]);
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	public function buildColumnPinned($postId)
+	{
+		$pinned = glsr(Database::class)->get($postId, 'pinned')
+			? 'pinned '
+			: '';
+		return glsr(Builder::class)->i([
+			'class' => $pinned.'dashicons dashicons-sticky',
+			'data-id' => $postId,
+		]);
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    public function buildColumnReviewer($postId)
-    {
-        return strval(glsr(Database::class)->get($postId, 'author'));
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	public function buildColumnReviewer($postId)
+	{
+		return strval(glsr(Database::class)->get($postId, 'author'));
+	}
 
-    /**
-     * @param int $postId
-     * @param int|null $rating
-     * @return string
-     */
-    public function buildColumnRating($postId)
-    {
-        return glsr_star_rating(intval(glsr(Database::class)->get($postId, 'rating')));
-    }
+	/**
+	 * @param int $postId
+	 * @param int|null $rating
+	 * @return string
+	 */
+	public function buildColumnRating($postId)
+	{
+		return glsr_star_rating(intval(glsr(Database::class)->get($postId, 'rating')));
+	}
 
-    /**
-     * @param int $postId
-     * @return string
-     */
-    public function buildColumnReviewType($postId)
-    {
-        $type = glsr(Database::class)->get($postId, 'review_type');
-        return array_key_exists($type, glsr()->reviewTypes)
-            ? glsr()->reviewTypes[$type]
-            : __('Unsupported Type', 'site-reviews');
-    }
+	/**
+	 * @param int $postId
+	 * @return string
+	 */
+	public function buildColumnReviewType($postId)
+	{
+		$type = glsr(Database::class)->get($postId, 'review_type');
+		return array_key_exists($type, glsr()->reviewTypes)
+			? glsr()->reviewTypes[$type]
+			: __('Unsupported Type', 'site-reviews');
+	}
 
-    /**
-     * @param string $postType
-     * @return void
-     */
-    public function renderFilters($postType)
-    {
-        if (Application::POST_TYPE !== $postType) {
-            return;
-        }
-        if (!($status = filter_input(INPUT_GET, 'post_status'))) {
-            $status = 'publish';
-        }
-        $ratings = glsr(Database::class)->getReviewsMeta('rating', $status);
-        $types = glsr(Database::class)->getReviewsMeta('review_type', $status);
-        $this->renderFilterRatings($ratings);
-        $this->renderFilterTypes($types);
-    }
+	/**
+	 * @param string $postType
+	 * @return void
+	 */
+	public function renderFilters($postType)
+	{
+		if (Application::POST_TYPE !== $postType) {
+			return;
+		}
+		if (!($status = filter_input(INPUT_GET, 'post_status'))) {
+			$status = 'publish';
+		}
+		$ratings = glsr(Database::class)->getReviewsMeta('rating', $status);
+		$types = glsr(Database::class)->getReviewsMeta('review_type', $status);
+		$this->renderFilterRatings($ratings);
+		$this->renderFilterTypes($types);
+	}
 
-    /**
-     * @param string $column
-     * @param int $postId
-     * @return void
-     */
-    public function renderValues($column, $postId)
-    {
-        $method = Helper::buildMethodName($column, 'buildColumn');
-        echo method_exists($this, $method)
-            ? call_user_func([$this, $method], $postId)
-            : apply_filters('site-reviews/columns/'.$column, '', $postId);
-    }
+	/**
+	 * @param string $column
+	 * @param int $postId
+	 * @return void
+	 */
+	public function renderValues($column, $postId)
+	{
+		$method = Helper::buildMethodName($column, 'buildColumn');
+		echo method_exists($this, $method)
+			? call_user_func([$this, $method], $postId)
+			: apply_filters('site-reviews/columns/'.$column, '', $postId);
+	}
 
-    /**
-     * @param array $ratings
-     * @return void
-     */
-    protected function renderFilterRatings($ratings)
-    {
-        if (empty($ratings)) {
-            return;
-        }
-        $ratings = array_flip(array_reverse($ratings));
-        array_walk($ratings, function (&$value, $key) {
-            $label = _n('%s star', '%s stars', $key, 'site-reviews');
-            $value = sprintf($label, $key);
-        });
-        echo glsr(Builder::class)->label(__('Filter by rating', 'site-reviews'), [
-            'class' => 'screen-reader-text',
-            'for' => 'rating',
-        ]);
-        echo glsr(Builder::class)->select([
-            'name' => 'rating',
-            'options' => ['' => __('All ratings', 'site-reviews')] + $ratings,
-            'value' => filter_input(INPUT_GET, 'rating'),
-        ]);
-    }
+	/**
+	 * @param array $ratings
+	 * @return void
+	 */
+	protected function renderFilterRatings($ratings)
+	{
+		if (empty($ratings)) {
+			return;
+		}
+		$ratings = array_flip(array_reverse($ratings));
+		array_walk($ratings, function (&$value, $key) {
+			$label = _n('%s star', '%s stars', $key, 'site-reviews');
+			$value = sprintf($label, $key);
+		});
+		echo glsr(Builder::class)->label(__('Filter by rating', 'site-reviews'), [
+			'class' => 'screen-reader-text',
+			'for' => 'rating',
+		]);
+		echo glsr(Builder::class)->select([
+			'name' => 'rating',
+			'options' => ['' => __('All ratings', 'site-reviews')] + $ratings,
+			'value' => filter_input(INPUT_GET, 'rating'),
+		]);
+	}
 
-    /**
-     * @param array $types
-     * @return void
-     */
-    protected function renderFilterTypes($types)
-    {
-        if (count(glsr()->reviewTypes) < 2) {
-            return;
-        }
-        echo glsr(Builder::class)->label(__('Filter by type', 'site-reviews'), [
-            'class' => 'screen-reader-text',
-            'for' => 'review_type',
-        ]);
-        echo glsr(Builder::class)->select([
-            'name' => 'review_type',
-            'options' => ['' => __('All types', 'site-reviews')] + glsr()->reviewTypes,
-            'value' => filter_input(INPUT_GET, 'review_type'),
-        ]);
-    }
+	/**
+	 * @param array $types
+	 * @return void
+	 */
+	protected function renderFilterTypes($types)
+	{
+		if (count(glsr()->reviewTypes) < 2) {
+			return;
+		}
+		echo glsr(Builder::class)->label(__('Filter by type', 'site-reviews'), [
+			'class' => 'screen-reader-text',
+			'for' => 'review_type',
+		]);
+		echo glsr(Builder::class)->select([
+			'name' => 'review_type',
+			'options' => ['' => __('All types', 'site-reviews')] + glsr()->reviewTypes,
+			'value' => filter_input(INPUT_GET, 'review_type'),
+		]);
+	}
 }

plugin/Handlers/RegisterShortcodes.php

Indentation +14 added lines, -14 removed lines

@@ -7,18 +7,18 @@
 
 class RegisterShortcodes
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        foreach ($command->shortcodes as $shortcode) {
-            $shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes');
-            if (!class_exists($shortcodeClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass));
-                continue;
-            }
-            add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']);
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		foreach ($command->shortcodes as $shortcode) {
+			$shortcodeClass = Helper::buildClassName($shortcode.'-shortcode', 'Shortcodes');
+			if (!class_exists($shortcodeClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $shortcodeClass));
+				continue;
+			}
+			add_shortcode($shortcode, [glsr($shortcodeClass), 'buildShortcode']);
+		}
+	}
 }

plugin/Handlers/RegisterTinymcePopups.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
 
 class RegisterTinymcePopups
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        foreach ($command->popups as $slug => $label) {
-            $buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
-            if (!class_exists($buttonClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
-                continue;
-            }
-            $shortcode = glsr($buttonClass)->register($slug, [
-                'label' => $label,
-                'title' => $label,
-            ]);
-            glsr()->mceShortcodes[$slug] = $shortcode->properties;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		foreach ($command->popups as $slug => $label) {
+			$buttonClass = Helper::buildClassName($slug.'-popup', 'Shortcodes');
+			if (!class_exists($buttonClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $buttonClass));
+				continue;
+			}
+			$shortcode = glsr($buttonClass)->register($slug, [
+				'label' => $label,
+				'title' => $label,
+			]);
+			glsr()->mceShortcodes[$slug] = $shortcode->properties;
+		}
+	}
 }

plugin/Handlers/RegisterWidgets.php

Indentation +17 added lines, -17 removed lines

@@ -8,21 +8,21 @@
 
 class RegisterWidgets
 {
-    /**
-     * @return void
-     */
-    public function handle(Command $command)
-    {
-        global $wp_widget_factory;
-        foreach ($command->widgets as $key => $values) {
-            $widgetClass = Helper::buildClassName($key.'-widget', 'Widgets');
-            if (!class_exists($widgetClass)) {
-                glsr_log()->error(sprintf('Class missing (%s)', $widgetClass));
-                continue;
-            }
-            // Here we bypass register_widget() in order to pass our custom values to the widget
-            $widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values);
-            $wp_widget_factory->widgets[$widgetClass] = $widget;
-        }
-    }
+	/**
+	 * @return void
+	 */
+	public function handle(Command $command)
+	{
+		global $wp_widget_factory;
+		foreach ($command->widgets as $key => $values) {
+			$widgetClass = Helper::buildClassName($key.'-widget', 'Widgets');
+			if (!class_exists($widgetClass)) {
+				glsr_log()->error(sprintf('Class missing (%s)', $widgetClass));
+				continue;
+			}
+			// Here we bypass register_widget() in order to pass our custom values to the widget
+			$widget = new $widgetClass(Application::ID.'_'.$key, $values['title'], $values);
+			$wp_widget_factory->widgets[$widgetClass] = $widget;
+		}
+	}
 }

plugin/Helper.php

Indentation +111 added lines, -111 removed lines

@@ -8,121 +8,121 @@
 
 class Helper
 {
-    /**
-     * @param string $name
-     * @param string $path
-     * @return string
-     */
-    public static function buildClassName($name, $path = '')
-    {
-        $className = Str::camelCase($name);
-        $path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
-        return !empty($path)
-            ? __NAMESPACE__.'\\'.$path.'\\'.$className
-            : $className;
-    }
+	/**
+	 * @param string $name
+	 * @param string $path
+	 * @return string
+	 */
+	public static function buildClassName($name, $path = '')
+	{
+		$className = Str::camelCase($name);
+		$path = ltrim(str_replace(__NAMESPACE__, '', $path), '\\');
+		return !empty($path)
+			? __NAMESPACE__.'\\'.$path.'\\'.$className
+			: $className;
+	}
 
-    /**
-     * @param string $name
-     * @param string $prefix
-     * @return string
-     */
-    public static function buildMethodName($name, $prefix = '')
-    {
-        return lcfirst($prefix.static::buildClassName($name));
-    }
+	/**
+	 * @param string $name
+	 * @param string $prefix
+	 * @return string
+	 */
+	public static function buildMethodName($name, $prefix = '')
+	{
+		return lcfirst($prefix.static::buildClassName($name));
+	}
 
-    /**
-     * @param string $name
-     * @return string
-     */
-    public static function buildPropertyName($name)
-    {
-        return lcfirst(static::buildClassName($name));
-    }
+	/**
+	 * @param string $name
+	 * @return string
+	 */
+	public static function buildPropertyName($name)
+	{
+		return lcfirst(static::buildClassName($name));
+	}
 
-    /**
-     * @param string $cast
-     * @param mixed $value
-     * @return mixed
-     */
-    public static function castTo($cast = '', $value)
-    {
-        switch ($cast) {
-            case 'array':
-                return (array) $value;
-            case 'bool':
-            case 'boolean':
-                return filter_var($value, FILTER_VALIDATE_BOOLEAN);
-            case 'float':
-                return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
-            case 'int':
-            case 'integer':
-                return (int) filter_var($value, FILTER_VALIDATE_INT);
-            case 'object':
-                return (object) (array) $value;
-            case 'str':
-            case 'string':
-                if (is_object($value) && in_array('__toString', get_class_methods($value))) {
-                    return (string) $value->__toString();
-                }
-                if (is_array($value) || is_object($value)) {
-                    return serialize($value);
-                }
-                return (string) $value;
-            default:
-                return $value;
-        }
-    }
+	/**
+	 * @param string $cast
+	 * @param mixed $value
+	 * @return mixed
+	 */
+	public static function castTo($cast = '', $value)
+	{
+		switch ($cast) {
+			case 'array':
+				return (array) $value;
+			case 'bool':
+			case 'boolean':
+				return filter_var($value, FILTER_VALIDATE_BOOLEAN);
+			case 'float':
+				return (float) filter_var($value, FILTER_VALIDATE_FLOAT, FILTER_FLAG_ALLOW_THOUSAND);
+			case 'int':
+			case 'integer':
+				return (int) filter_var($value, FILTER_VALIDATE_INT);
+			case 'object':
+				return (object) (array) $value;
+			case 'str':
+			case 'string':
+				if (is_object($value) && in_array('__toString', get_class_methods($value))) {
+					return (string) $value->__toString();
+				}
+				if (is_array($value) || is_object($value)) {
+					return serialize($value);
+				}
+				return (string) $value;
+			default:
+				return $value;
+		}
+	}
 
-    /**
-     * @param string $key
-     * @return mixed
-     */
-    public static function filterInput($key, array $request = [])
-    {
-        if (isset($request[$key])) {
-            return $request[$key];
-        }
-        $variable = filter_input(INPUT_POST, $key);
-        if (is_null($variable) && isset($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return $variable;
-    }
+	/**
+	 * @param string $key
+	 * @return mixed
+	 */
+	public static function filterInput($key, array $request = [])
+	{
+		if (isset($request[$key])) {
+			return $request[$key];
+		}
+		$variable = filter_input(INPUT_POST, $key);
+		if (is_null($variable) && isset($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return $variable;
+	}
 
-    /**
-     * @param string $key
-     * @return array
-     */
-    public static function filterInputArray($key)
-    {
-        $variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
-        if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
-            $variable = $_POST[$key];
-        }
-        return (array) $variable;
-    }
+	/**
+	 * @param string $key
+	 * @return array
+	 */
+	public static function filterInputArray($key)
+	{
+		$variable = filter_input(INPUT_POST, $key, FILTER_DEFAULT, FILTER_REQUIRE_ARRAY);
+		if (empty($variable) && !empty($_POST[$key]) && is_array($_POST[$key])) {
+			$variable = $_POST[$key];
+		}
+		return (array) $variable;
+	}
 
-    /**
-     * @return string
-     */
-    public static function getIpAddress()
-    {
-        $cloudflareIps = glsr(Cache::class)->getCloudflareIps();
-        $whitelist = [
-            Whip::CLOUDFLARE_HEADERS => [Whip::IPV4 => $cloudflareIps['v4']],
-            // Whip::CUSTOM_HEADERS => [Whip::IPV4 => ['127.0.0.1']],
-        ];
-        if (defined('AF_INET6')) {
-            $whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
-            // $whitelist[Whip::CUSTOM_HEADERS][Whip::IPV6] = ['::1'];
-        }
-        $whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
-        $methods = Whip::CUSTOM_HEADERS | Whip::CLOUDFLARE_HEADERS | Whip::REMOTE_ADDR;
-        $methods = apply_filters('site-reviews/whip/methods', $methods);
-        $whip = new Whip($methods, $whitelist);
-        do_action_ref_array('site-reviews/whip', [$whip]);
-        return (string) $whip->getValidIpAddress();
-    }
+	/**
+	 * @return string
+	 */
+	public static function getIpAddress()
+	{
+		$cloudflareIps = glsr(Cache::class)->getCloudflareIps();
+		$whitelist = [
+			Whip::CLOUDFLARE_HEADERS => [Whip::IPV4 => $cloudflareIps['v4']],
+			// Whip::CUSTOM_HEADERS => [Whip::IPV4 => ['127.0.0.1']],
+		];
+		if (defined('AF_INET6')) {
+			$whitelist[Whip::CLOUDFLARE_HEADERS][Whip::IPV6] = $cloudflareIps['v6'];
+			// $whitelist[Whip::CUSTOM_HEADERS][Whip::IPV6] = ['::1'];
+		}
+		$whitelist = apply_filters('site-reviews/whip/whitelist', $whitelist);
+		$methods = Whip::CUSTOM_HEADERS | Whip::CLOUDFLARE_HEADERS | Whip::REMOTE_ADDR;
+		$methods = apply_filters('site-reviews/whip/methods', $methods);
+		$whip = new Whip($methods, $whitelist);
+		do_action_ref_array('site-reviews/whip', [$whip]);
+		return (string) $whip->getValidIpAddress();
+	}
 }

plugin/Defaults/ValidateReviewDefaults.php

Indentation +18 added lines, -18 removed lines

@@ -7,22 +7,22 @@
 
 class ValidateReviewDefaults extends Defaults
 {
-    /**
-     * @return array
-     */
-    protected function defaults()
-    {
-        return [
-            'assign_to' => '',
-            'category' => '',
-            'content' => '',
-            'email' => '',
-            'form_id' => '',
-            'ip_address' => Helper::getIpAddress(), // required for Akismet and Blacklist validation
-            'name' => '',
-            'rating' => '0',
-            'terms' => '',
-            'title' => '',
-        ];
-    }
+	/**
+	 * @return array
+	 */
+	protected function defaults()
+	{
+		return [
+			'assign_to' => '',
+			'category' => '',
+			'content' => '',
+			'email' => '',
+			'form_id' => '',
+			'ip_address' => Helper::getIpAddress(), // required for Akismet and Blacklist validation
+			'name' => '',
+			'rating' => '0',
+			'terms' => '',
+			'title' => '',
+		];
+	}
 }

plugin/Defaults/DefaultsAbstract.php

Indentation +102 added lines, -102 removed lines

@@ -7,117 +7,117 @@
 
 abstract class DefaultsAbstract
 {
-    /**
-     * @var array
-     */
-    protected $callable = [
-        'defaults', 'filter', 'merge', 'restrict', 'unguarded',
-    ];
+	/**
+	 * @var array
+	 */
+	protected $callable = [
+		'defaults', 'filter', 'merge', 'restrict', 'unguarded',
+	];
 
-    /**
-     * @var array
-     */
-    protected $guarded = [];
+	/**
+	 * @var array
+	 */
+	protected $guarded = [];
 
-    /**
-     * @param string $name
-     * @return void|array
-     */
-    public function __call($name, array $args = [])
-    {
-        if (!method_exists($this, $name) || !in_array($name, $this->callable)) {
-            return;
-        }
-        $defaults = call_user_func_array([$this, $name], $args);
-        $hookName = (new ReflectionClass($this))->getShortName();
-        $hookName = str_replace('Defaults', '', $hookName);
-        $hookName = Str::dashCase($hookName);
-        return apply_filters('site-reviews/defaults/'.$hookName, $defaults, $name);
-    }
+	/**
+	 * @param string $name
+	 * @return void|array
+	 */
+	public function __call($name, array $args = [])
+	{
+		if (!method_exists($this, $name) || !in_array($name, $this->callable)) {
+			return;
+		}
+		$defaults = call_user_func_array([$this, $name], $args);
+		$hookName = (new ReflectionClass($this))->getShortName();
+		$hookName = str_replace('Defaults', '', $hookName);
+		$hookName = Str::dashCase($hookName);
+		return apply_filters('site-reviews/defaults/'.$hookName, $defaults, $name);
+	}
 
-    /**
-     * @return array
-     */
-    abstract protected function defaults();
+	/**
+	 * @return array
+	 */
+	abstract protected function defaults();
 
-    /**
-     * @return array
-     */
-    protected function filter(array $values = [])
-    {
-        return $this->normalize($this->merge(array_filter($values)), $values);
-    }
+	/**
+	 * @return array
+	 */
+	protected function filter(array $values = [])
+	{
+		return $this->normalize($this->merge(array_filter($values)), $values);
+	}
 
-    /**
-     * @return string
-     */
-    protected function filteredJson(array $values = [])
-    {
-        $defaults = $this->flattenArray(
-            array_diff_key($this->defaults(), array_flip($this->guarded))
-        );
-        $values = $this->flattenArray(
-            shortcode_atts($defaults, $values)
-        );
-        $filtered = array_filter(array_diff_assoc($values, $defaults), function ($value) {
-            return !$this->isEmpty($value);
-        });
-        return json_encode($filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
-    }
+	/**
+	 * @return string
+	 */
+	protected function filteredJson(array $values = [])
+	{
+		$defaults = $this->flattenArray(
+			array_diff_key($this->defaults(), array_flip($this->guarded))
+		);
+		$values = $this->flattenArray(
+			shortcode_atts($defaults, $values)
+		);
+		$filtered = array_filter(array_diff_assoc($values, $defaults), function ($value) {
+			return !$this->isEmpty($value);
+		});
+		return json_encode($filtered, JSON_HEX_APOS | JSON_HEX_QUOT | JSON_HEX_TAG | JSON_UNESCAPED_SLASHES | JSON_UNESCAPED_UNICODE);
+	}
 
-    /**
-     * @return array
-     */
-    protected function flattenArray(array $values)
-    {
-        array_walk($values, function (&$value) {
-            if (!is_array($value)) {
-                return;
-            }
-            $value = implode(',', $value);
-        });
-        return $values;
-    }
+	/**
+	 * @return array
+	 */
+	protected function flattenArray(array $values)
+	{
+		array_walk($values, function (&$value) {
+			if (!is_array($value)) {
+				return;
+			}
+			$value = implode(',', $value);
+		});
+		return $values;
+	}
 
-    /**
-     * @param mixed $var
-     * @return bool
-     */
-    protected function isEmpty($var)
-    {
-        return !is_numeric($var) && !is_bool($var) && empty($var);
-    }
+	/**
+	 * @param mixed $var
+	 * @return bool
+	 */
+	protected function isEmpty($var)
+	{
+		return !is_numeric($var) && !is_bool($var) && empty($var);
+	}
 
-    /**
-     * @return array
-     */
-    protected function merge(array $values = [])
-    {
-        return $this->normalize(wp_parse_args($values, $this->defaults()), $values);
-    }
+	/**
+	 * @return array
+	 */
+	protected function merge(array $values = [])
+	{
+		return $this->normalize(wp_parse_args($values, $this->defaults()), $values);
+	}
 
-    /**
-     * @return array
-     */
-    protected function normalize(array $values, array $originalValues)
-    {
-        $values['json'] = $this->filteredJson($originalValues);
-        return $values;
-    }
+	/**
+	 * @return array
+	 */
+	protected function normalize(array $values, array $originalValues)
+	{
+		$values['json'] = $this->filteredJson($originalValues);
+		return $values;
+	}
 
-    /**
-     * @return array
-     */
-    protected function restrict(array $values = [])
-    {
-        return $this->normalize(shortcode_atts($this->defaults(), $values), $values);
-    }
+	/**
+	 * @return array
+	 */
+	protected function restrict(array $values = [])
+	{
+		return $this->normalize(shortcode_atts($this->defaults(), $values), $values);
+	}
 
-    /**
-     * @return array
-     */
-    protected function unguarded()
-    {
-        return array_diff_key($this->defaults(), array_flip($this->guarded));
-    }
+	/**
+	 * @return array
+	 */
+	protected function unguarded()
+	{
+		return array_diff_key($this->defaults(), array_flip($this->guarded));
+	}
 }