pryley / site-reviews

plugin/Modules/Validator/ValidateReview.php

Spacing +70 added lines, -70 removed lines

@@ -58,19 +58,19 @@ 
     /**
      * @return static
      */
-    public function validate(array $request)
+    public function validate( array $request )
     {
         $this->form_id = $request['form_id'];
-        $this->options = glsr(OptionManager::class)->all();
-        $this->request = $this->validateRequest($request);
+        $this->options = glsr( OptionManager::class )->all();
+        $this->request = $this->validateRequest( $request );
         $this->validateCustom();
         $this->validateHoneyPot();
         $this->validateReviewLimits();
         $this->validateBlacklist();
         $this->validateAkismet();
         $this->validateRecaptcha();
-        if (!empty($this->error)) {
-            $this->setSessionValues('message', $this->error);
+        if( !empty($this->error) ) {
+            $this->setSessionValues( 'message', $this->error );
         }
         return $this;
     }
@@ -80,9 +80,9 @@ 
      * @param mixed $fallback
      * @return mixed
      */
-    protected function getOption($path, $fallback = '')
+    protected function getOption( $path, $fallback = '' )
     {
-        return Arr::get($this->options, $path, $fallback);
+        return Arr::get( $this->options, $path, $fallback );
     }
 
     /**
@@ -90,11 +90,11 @@ 
      */
     protected function getRecaptchaStatus()
     {
-        if (!glsr(OptionManager::class)->isRecaptchaEnabled()) {
+        if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) {
             return static::RECAPTCHA_DISABLED;
         }
-        if (empty($this->request['_recaptcha-token'])) {
-            return $this->request['_counter'] < intval(apply_filters('site-reviews/recaptcha/timeout', 5))
+        if( empty($this->request['_recaptcha-token']) ) {
+            return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) )
                 ? static::RECAPTCHA_EMPTY
                 : static::RECAPTCHA_FAILED;
         }
@@ -106,23 +106,23 @@ 
      */
     protected function getRecaptchaTokenStatus()
     {
-        $endpoint = add_query_arg([
+        $endpoint = add_query_arg( [
             'remoteip' => Helper::getIpAddress(),
             'response' => $this->request['_recaptcha-token'],
-            'secret' => $this->getOption('settings.submissions.recaptcha.secret'),
-        ], static::RECAPTCHA_ENDPOINT);
-        if (is_wp_error($response = wp_remote_get($endpoint))) {
-            glsr_log()->error($response->get_error_message());
+            'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ),
+        ], static::RECAPTCHA_ENDPOINT );
+        if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) {
+            glsr_log()->error( $response->get_error_message() );
             return static::RECAPTCHA_FAILED;
         }
-        $response = json_decode(wp_remote_retrieve_body($response));
-        if (!empty($response->success)) {
-            return boolval($response->success)
+        $response = json_decode( wp_remote_retrieve_body( $response ) );
+        if( !empty($response->success) ) {
+            return boolval( $response->success )
                 ? static::RECAPTCHA_VALID
                 : static::RECAPTCHA_INVALID;
         }
-        foreach ($response->{'error-codes'} as $error) {
-            glsr_log()->error('reCAPTCHA error: '.$error);
+        foreach( $response->{'error-codes'} as $error ) {
+            glsr_log()->error( 'reCAPTCHA error: '.$error );
         }
         return static::RECAPTCHA_INVALID;
     }
@@ -130,35 +130,35 @@ 
     /**
      * @return array
      */
-    protected function getValidationRules(array $request)
+    protected function getValidationRules( array $request )
     {
         $rules = array_intersect_key(
-            apply_filters('site-reviews/validation/rules', static::VALIDATION_RULES, $request),
-            array_flip($this->getOption('settings.submissions.required', []))
+            apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
+            array_flip( $this->getOption( 'settings.submissions.required', [] ) )
         );
-        $excluded = explode(',', Arr::get($request, 'excluded'));
-        return array_diff_key($rules, array_flip($excluded));
+        $excluded = explode( ',', Arr::get( $request, 'excluded' ) );
+        return array_diff_key( $rules, array_flip( $excluded ) );
     }
 
     /**
      * @return bool
      */
-    protected function isRequestValid(array $request)
+    protected function isRequestValid( array $request )
     {
-        $rules = $this->getValidationRules($request);
-        $errors = glsr(Validator::class)->validate($request, $rules);
-        if (empty($errors)) {
+        $rules = $this->getValidationRules( $request );
+        $errors = glsr( Validator::class )->validate( $request, $rules );
+        if( empty($errors) ) {
             return true;
         }
-        $this->error = __('Please fix the submission errors.', 'site-reviews');
-        $this->setSessionValues('errors', $errors);
-        $this->setSessionValues('values', $request);
+        $this->error = __( 'Please fix the submission errors.', 'site-reviews' );
+        $this->setSessionValues( 'errors', $errors );
+        $this->setSessionValues( 'values', $request );
         return false;
     }
 
-    protected function setError($message, $loggedMessage = '')
+    protected function setError( $message, $loggedMessage = '' )
     {
-        $this->setSessionValues('errors', [], $loggedMessage);
+        $this->setSessionValues( 'errors', [], $loggedMessage );
         $this->error = $message;
     }
 
@@ -168,11 +168,11 @@ 
      * @param string $loggedMessage
      * @return void
      */
-    protected function setSessionValues($type, $value, $loggedMessage = '')
+    protected function setSessionValues( $type, $value, $loggedMessage = '' )
     {
-        glsr()->sessionSet($this->form_id.$type, $value);
-        if (!empty($loggedMessage)) {
-            glsr_log()->warning($loggedMessage)->debug($this->request);
+        glsr()->sessionSet( $this->form_id.$type, $value );
+        if( !empty($loggedMessage) ) {
+            glsr_log()->warning( $loggedMessage )->debug( $this->request );
         }
     }
 
@@ -181,11 +181,11 @@ 
      */
     protected function validateAkismet()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (glsr(Akismet::class)->isSpam($this->request)) {
-            $this->setError(__('This review has been flagged as possible spam and cannot be submitted.', 'site-reviews'),
+        if( glsr( Akismet::class )->isSpam( $this->request ) ) {
+            $this->setError( __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' ),
                 'Akismet caught a spam submission (consider adding the IP address to the blacklist):'
             );
         }
@@ -196,18 +196,18 @@ 
      */
     protected function validateBlacklist()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!glsr(Blacklist::class)->isBlacklisted($this->request)) {
+        if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) ) {
             return;
         }
-        $blacklistAction = $this->getOption('settings.submissions.blacklist.action');
-        if ('reject' != $blacklistAction) {
+        $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
+        if( 'reject' != $blacklistAction ) {
             $this->request['blacklisted'] = true;
             return;
         }
-        $this->setError(__('Your review cannot be submitted at this time.', 'site-reviews'),
+        $this->setError( __( 'Your review cannot be submitted at this time.', 'site-reviews' ),
             'Blacklisted submission detected:'
         );
     }
@@ -217,18 +217,18 @@ 
      */
     protected function validateCustom()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        $validated = apply_filters('site-reviews/validate/custom', true, $this->request);
-        if (true === $validated) {
+        $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
+        if( true === $validated ) {
             return;
         }
-        $errorMessage = is_string($validated)
+        $errorMessage = is_string( $validated )
             ? $validated
-            : __('The review submission failed. Please notify the site administrator.', 'site-reviews');
-        $this->setError($errorMessage);
-        $this->setSessionValues('values', $this->request);
+            : __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
+        $this->setError( $errorMessage );
+        $this->setSessionValues( 'values', $this->request );
     }
 
     /**
@@ -236,11 +236,11 @@ 
      */
     protected function validateHoneyPot()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (!empty($this->request['gotcha'])) {
-            $this->setError(__('The review submission failed. Please notify the site administrator.', 'site-reviews'),
+        if( !empty($this->request['gotcha']) ) {
+            $this->setError( __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ),
                 'The Honeypot caught a bad submission:'
             );
         }
@@ -251,11 +251,11 @@ 
      */
     protected function validateReviewLimits()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
-        if (glsr(ReviewLimits::class)->hasReachedLimit($this->request)) {
-            $this->setError(__('You have already submitted a review.', 'site-reviews'));
+        if( glsr( ReviewLimits::class )->hasReachedLimit( $this->request ) ) {
+            $this->setError( __( 'You have already submitted a review.', 'site-reviews' ) );
         }
     }
 
@@ -264,33 +264,33 @@ 
      */
     protected function validateRecaptcha()
     {
-        if (!empty($this->error)) {
+        if( !empty($this->error) ) {
             return;
         }
         $status = $this->getRecaptchaStatus();
-        if (in_array($status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID])) {
+        if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) ) {
             return;
         }
-        if (static::RECAPTCHA_EMPTY === $status) {
-            $this->setSessionValues('recaptcha', 'unset');
+        if( static::RECAPTCHA_EMPTY === $status ) {
+            $this->setSessionValues( 'recaptcha', 'unset' );
             $this->recaptchaIsUnset = true;
             return;
         }
-        $this->setSessionValues('recaptcha', 'reset');
+        $this->setSessionValues( 'recaptcha', 'reset' );
         $errors = [
-            static::RECAPTCHA_FAILED => __('The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews'),
-            static::RECAPTCHA_INVALID => __('The reCAPTCHA verification failed, please try again.', 'site-reviews'),
+            static::RECAPTCHA_FAILED => __( 'The reCAPTCHA failed to load, please refresh the page and try again.', 'site-reviews' ),
+            static::RECAPTCHA_INVALID => __( 'The reCAPTCHA verification failed, please try again.', 'site-reviews' ),
         ];
-        $this->setError($errors[$status]);
+        $this->setError( $errors[$status] );
     }
 
     /**
      * @return array
      */
-    protected function validateRequest(array $request)
+    protected function validateRequest( array $request )
     {
-        if ($this->isRequestValid($request)) {
-            return array_merge(glsr(ValidateReviewDefaults::class)->defaults(), $request);
+        if( $this->isRequestValid( $request ) ) {
+            return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );
         }
         return $request;
     }