@@ -115,7 +115,9 @@ discard block |
||
| 115 | 115 | protected function sendNotification( $post_id, Command $command ) |
| 116 | 116 | { |
| 117 | 117 | $notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' ); |
| 118 | - if( !in_array( $notificationType, ['default','custom','webhook'] ))return; |
|
| 118 | + if( !in_array( $notificationType, ['default','custom','webhook'] )) { |
|
| 119 | + return; |
|
| 120 | + } |
|
| 119 | 121 | $assignedToTitle = get_the_title( (int) $command->assignedTo ); |
| 120 | 122 | $notificationSubject = _nx( |
| 121 | 123 | 'New %s-star review', |
@@ -162,7 +164,9 @@ discard block |
||
| 162 | 164 | */ |
| 163 | 165 | protected function sendWebhookNotification( Command $command, array $args ) |
| 164 | 166 | { |
| 165 | - if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return; |
|
| 167 | + if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' ))) { |
|
| 168 | + return; |
|
| 169 | + } |
|
| 166 | 170 | $notification = $this->createWebhookNotification( $command, $args ); |
| 167 | 171 | $result = wp_remote_post( $endpoint, [ |
| 168 | 172 | 'method' => 'POST', |
@@ -57,9 +57,13 @@ discard block |
||
| 57 | 57 | protected function generateFields( array $fields ) |
| 58 | 58 | { |
| 59 | 59 | $generatedFields = array_map( function( $field ) { |
| 60 | - if( empty( $field ))return; |
|
| 60 | + if( empty( $field )) { |
|
| 61 | + return; |
|
| 62 | + } |
|
| 61 | 63 | $field = $this->normalize( $field ); |
| 62 | - if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] )))return; |
|
| 64 | + if( !method_exists( $this, $method = 'normalize'.ucfirst( $field['type'] ))) { |
|
| 65 | + return; |
|
| 66 | + } |
|
| 63 | 67 | return $this->$method( $field ); |
| 64 | 68 | }, $fields ); |
| 65 | 69 | return array_values( array_filter( $generatedFields )); |
@@ -74,7 +78,9 @@ discard block |
||
| 74 | 78 | if( !empty( $this->errors )) { |
| 75 | 79 | $errors = []; |
| 76 | 80 | foreach( $this->required as $name => $alert ) { |
| 77 | - if( false !== array_search( $name, array_column( $fields, 'name' )))continue; |
|
| 81 | + if( false !== array_search( $name, array_column( $fields, 'name' ))) { |
|
| 82 | + continue; |
|
| 83 | + } |
|
| 78 | 84 | $errors[] = $this->errors[$name]; |
| 79 | 85 | } |
| 80 | 86 | $this->errors = $errors; |
@@ -118,7 +124,9 @@ discard block |
||
| 118 | 124 | */ |
| 119 | 125 | protected function normalizeContainer( array $field ) |
| 120 | 126 | { |
| 121 | - if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field ))return; |
|
| 127 | + if( !array_key_exists( 'html', $field ) && !array_key_exists( 'items', $field )) { |
|
| 128 | + return; |
|
| 129 | + } |
|
| 122 | 130 | $field['items'] = $this->generateFields( $field['items'] ); |
| 123 | 131 | return $field; |
| 124 | 132 | } |
@@ -128,7 +136,9 @@ discard block |
||
| 128 | 136 | */ |
| 129 | 137 | protected function normalizeField( array $field, array $defaults ) |
| 130 | 138 | { |
| 131 | - if( !$this->validate( $field ))return; |
|
| 139 | + if( !$this->validate( $field )) { |
|
| 140 | + return; |
|
| 141 | + } |
|
| 132 | 142 | return array_filter( shortcode_atts( $defaults, $field ), function( $value ) { |
| 133 | 143 | return $value !== ''; |
| 134 | 144 | }); |
@@ -149,7 +159,9 @@ discard block |
||
| 149 | 159 | 'type' => '', |
| 150 | 160 | 'value' => '', |
| 151 | 161 | ]); |
| 152 | - if( !is_array( $listbox ))return; |
|
| 162 | + if( !is_array( $listbox )) { |
|
| 163 | + return; |
|
| 164 | + } |
|
| 153 | 165 | if( !array_key_exists( '', $listbox['options'] )) { |
| 154 | 166 | $listbox['options'] = ['' => $listbox['placeholder']] + $listbox['options']; |
| 155 | 167 | } |
@@ -30,7 +30,9 @@ |
||
| 30 | 30 | { |
| 31 | 31 | $diff = time() - strtotime( $date ); |
| 32 | 32 | foreach( static::$TIME_PERIODS as $i => $timePeriod ) { |
| 33 | - if( $diff > $timePeriod[0] )continue; |
|
| 33 | + if( $diff > $timePeriod[0] ) { |
|
| 34 | + continue; |
|
| 35 | + } |
|
| 34 | 36 | $unit = intval( floor( $diff / $timePeriod[1] )); |
| 35 | 37 | $relativeDates = [ |
| 36 | 38 | _n( '%s second ago', '%s seconds ago', $unit, 'site-reviews' ), |
@@ -161,7 +161,9 @@ discard block |
||
| 161 | 161 | if( !empty( $sessions )) { |
| 162 | 162 | $now = time(); |
| 163 | 163 | foreach( $sessions as $session ) { |
| 164 | - if( $now <= $session->expiration )continue; |
|
| 164 | + if( $now <= $session->expiration ) { |
|
| 165 | + continue; |
|
| 166 | + } |
|
| 165 | 167 | $expiredSessions[] = $session->name; |
| 166 | 168 | $expiredSessions[] = str_replace( '_expires_', '_', $session->name ); |
| 167 | 169 | } |
@@ -204,7 +206,9 @@ discard block |
||
| 204 | 206 | */ |
| 205 | 207 | protected function setCookie() |
| 206 | 208 | { |
| 207 | - if( headers_sent() )return; |
|
| 209 | + if( headers_sent() ) { |
|
| 210 | + return; |
|
| 211 | + } |
|
| 208 | 212 | $cookie = $this->sessionId.'||'.$this->expiryTimestamp.'||'.$this->expiryTimestampReset; |
| 209 | 213 | $cookiePath = preg_replace( '|https?://[^/]+|i', '', trailingslashit( (string)get_option( 'home' ))); |
| 210 | 214 | setcookie( static::SESSION_COOKIE, $cookie, $this->expiryTimestamp, $cookiePath ); |
@@ -171,8 +171,12 @@ discard block |
||
| 171 | 171 | */ |
| 172 | 172 | protected function validateAkismet() |
| 173 | 173 | { |
| 174 | - if( !empty( $this->error ))return; |
|
| 175 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
| 174 | + if( !empty( $this->error )) { |
|
| 175 | + return; |
|
| 176 | + } |
|
| 177 | + if( !glsr( Akismet::class )->isSpam( $this->request )) { |
|
| 178 | + return; |
|
| 179 | + } |
|
| 176 | 180 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
| 177 | 181 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
| 178 | 182 | } |
@@ -182,8 +186,12 @@ discard block |
||
| 182 | 186 | */ |
| 183 | 187 | protected function validateBlacklist() |
| 184 | 188 | { |
| 185 | - if( !empty( $this->error ))return; |
|
| 186 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
| 189 | + if( !empty( $this->error )) { |
|
| 190 | + return; |
|
| 191 | + } |
|
| 192 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) { |
|
| 193 | + return; |
|
| 194 | + } |
|
| 187 | 195 | $blacklistAction = glsr( OptionManager::class )->get( 'settings.reviews-form.blacklist.action' ); |
| 188 | 196 | if( $blacklistAction == 'unapprove' ) { |
| 189 | 197 | $this->request['blacklisted'] = true; |
@@ -199,9 +207,13 @@ discard block |
||
| 199 | 207 | */ |
| 200 | 208 | protected function validateCustom() |
| 201 | 209 | { |
| 202 | - if( !empty( $this->error ))return; |
|
| 210 | + if( !empty( $this->error )) { |
|
| 211 | + return; |
|
| 212 | + } |
|
| 203 | 213 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
| 204 | - if( $validated === true )return; |
|
| 214 | + if( $validated === true ) { |
|
| 215 | + return; |
|
| 216 | + } |
|
| 205 | 217 | $this->setSessionValues( 'errors', [] ); |
| 206 | 218 | $this->setSessionValues( 'values', $this->request ); |
| 207 | 219 | $this->error = is_string( $validated ) |
@@ -214,8 +226,12 @@ discard block |
||
| 214 | 226 | */ |
| 215 | 227 | protected function validateHoneyPot() |
| 216 | 228 | { |
| 217 | - if( !empty( $this->error ))return; |
|
| 218 | - if( empty( $this->request['gotcha'] ))return; |
|
| 229 | + if( !empty( $this->error )) { |
|
| 230 | + return; |
|
| 231 | + } |
|
| 232 | + if( empty( $this->request['gotcha'] )) { |
|
| 233 | + return; |
|
| 234 | + } |
|
| 219 | 235 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
| 220 | 236 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
| 221 | 237 | } |
@@ -225,7 +241,9 @@ discard block |
||
| 225 | 241 | */ |
| 226 | 242 | protected function validateRecaptcha() |
| 227 | 243 | { |
| 228 | - if( !empty( $this->error ))return; |
|
| 244 | + if( !empty( $this->error )) { |
|
| 245 | + return; |
|
| 246 | + } |
|
| 229 | 247 | $isValid = $this->isRecaptchaResponseValid(); |
| 230 | 248 | if( is_null( $isValid )) { |
| 231 | 249 | $this->setSessionValues( 'recaptcha', true ); |