pryley / site-reviews

plugin/Modules/Validator/ValidateReview.php

Spacing +23 added lines, -23 removed lines

@@ -67,7 +67,7 @@ 
 		$this->validateBlacklist();
 		$this->validateAkismet();
 		$this->validateRecaptcha();
-		if( !empty( $this->error )) {
+		if( !empty($this->error) ) {
 			$this->setSessionValues( 'message', $this->error );
 		}
 		return $this;
@@ -91,8 +91,8 @@ 
 		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;
 		}
@@ -104,17 +104,17 @@ 
 	 */
 	protected function getRecaptchaTokenStatus()
 	{
-		$endpoint = add_query_arg([
+		$endpoint = add_query_arg( [
 			'remoteip' => glsr( Helper::class )->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 ))) {
+		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 )) {
+		$response = json_decode( wp_remote_retrieve_body( $response ) );
+		if( !empty($response->success) ) {
 			return boolval( $response->success )
 				? static::RECAPTCHA_VALID
 				: static::RECAPTCHA_INVALID;
@@ -132,12 +132,12 @@ 
 	{
 		$rules = array_intersect_key(
 			apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ),
-			array_flip( $this->getOption( 'settings.submissions.required', [] ))
+			array_flip( $this->getOption( 'settings.submissions.required', [] ) )
 		);
-		$excluded = isset( $request['excluded'] )
+		$excluded = isset($request['excluded'])
 			? explode( ',', $request['excluded'] )
 			: [];
-		return array_diff_key( $rules, array_flip( $excluded ));
+		return array_diff_key( $rules, array_flip( $excluded ) );
 	}
 
 	/**
@@ -147,7 +147,7 @@ 
 	{
 		$rules = $this->getValidationRules( $request );
 		$errors = glsr( Validator::class )->validate( $request, $rules );
-		if( empty( $errors )) {
+		if( empty($errors) ) {
 			return true;
 		}
 		$this->setSessionValues( 'errors', $errors );
@@ -164,7 +164,7 @@ 
 	protected function setSessionValues( $type, $value, $loggedMessage = '' )
 	{
 		glsr( Session::class )->set( $this->form_id.$type, $value );
-		if( !empty( $loggedMessage )) {
+		if( !empty($loggedMessage) ) {
 			glsr_log()->warning( $loggedMessage );
 			glsr_log()->warning( $this->request );
 		}
@@ -175,8 +175,8 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Akismet::class )->isSpam( $this->request ) )return;
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):' );
 		$this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' );
 	}
@@ -186,8 +186,8 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty($this->error) )return;
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return;
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,7 +202,7 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
 		if( $validated === true )return;
 		$this->setSessionValues( 'errors', [] );
@@ -217,8 +217,8 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty($this->error) )return;
+		if( empty($this->request['gotcha']) )return;
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,9 +228,9 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty($this->error) )return;
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) )return;
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;
@@ -250,11 +250,11 @@ 
 	 */
 	protected function validateRequest( array $request )
 	{
-		if( !$this->isRequestValid( $request )) {
+		if( !$this->isRequestValid( $request ) ) {
 			$this->error = __( 'Please fix the submission errors.', 'site-reviews' );
 			return $request;
 		}
-		if( empty( $request['title'] )) {
+		if( empty($request['title']) ) {
 			$request['title'] = __( 'No Title', 'site-reviews' );
 		}
 		return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request );

Braces +30 added lines, -10 removed lines

@@ -175,8 +175,12 @@ 
 	 */
 	protected function validateAkismet()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Akismet::class )->isSpam( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Akismet::class )->isSpam( $this->request )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'Akismet caught a spam submission (consider adding the IP address to the blacklist):' );
 		$this->error = __( 'This review has been flagged as possible spam and cannot be submitted.', 'site-reviews' );
 	}
@@ -186,8 +190,12 @@ 
 	 */
 	protected function validateBlacklist()
 	{
-		if( !empty( $this->error ))return;
-		if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) {
+			return;
+		}
 		$blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' );
 		if( $blacklistAction == 'reject' ) {
 			$this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' );
@@ -202,9 +210,13 @@ 
 	 */
 	protected function validateCustom()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$validated = apply_filters( 'site-reviews/validate/custom', true, $this->request );
-		if( $validated === true )return;
+		if( $validated === true ) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [] );
 		$this->setSessionValues( 'values', $this->request );
 		$this->error = is_string( $validated )
@@ -217,8 +229,12 @@ 
 	 */
 	protected function validateHoneyPot()
 	{
-		if( !empty( $this->error ))return;
-		if( empty( $this->request['gotcha'] ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
+		if( empty( $this->request['gotcha'] )) {
+			return;
+		}
 		$this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' );
 		$this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' );
 	}
@@ -228,9 +244,13 @@ 
 	 */
 	protected function validateRecaptcha()
 	{
-		if( !empty( $this->error ))return;
+		if( !empty( $this->error )) {
+			return;
+		}
 		$status = $this->getRecaptchaStatus();
-		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return;
+		if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] )) {
+			return;
+		}
 		if( $status == static::RECAPTCHA_EMPTY ) {
 			$this->setSessionValues( 'recaptcha', 'unset' );
 			$this->recaptchaIsUnset = true;