@@ -60,7 +60,9 @@ discard block |
||
60 | 60 | public function catchFatalError() |
61 | 61 | { |
62 | 62 | $error = error_get_last(); |
63 | - if( $error['type'] !== E_ERROR )return; |
|
63 | + if( $error['type'] !== E_ERROR ) { |
|
64 | + return; |
|
65 | + } |
|
64 | 66 | glsr_log()->error( $error['message'] ); |
65 | 67 | } |
66 | 68 | |
@@ -204,7 +206,9 @@ discard block |
||
204 | 206 | */ |
205 | 207 | public function scheduleCronJob() |
206 | 208 | { |
207 | - if( wp_next_scheduled( static::CRON_EVENT ))return; |
|
209 | + if( wp_next_scheduled( static::CRON_EVENT )) { |
|
210 | + return; |
|
211 | + } |
|
208 | 212 | wp_schedule_event( time(), 'twicedaily', static::CRON_EVENT ); |
209 | 213 | } |
210 | 214 | |
@@ -235,7 +239,9 @@ discard block |
||
235 | 239 | || !in_array( plugin_basename( $this->file ), $data['plugins'] ) |
236 | 240 | || $data['action'] != 'update' |
237 | 241 | || $data['type'] != 'plugin' |
238 | - )return; |
|
242 | + ) { |
|
243 | + return; |
|
244 | + } |
|
239 | 245 | $this->upgrade(); |
240 | 246 | } |
241 | 247 |
@@ -166,8 +166,12 @@ discard block |
||
166 | 166 | */ |
167 | 167 | protected function validateAkismet() |
168 | 168 | { |
169 | - if( !empty( $this->error ))return; |
|
170 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
169 | + if( !empty( $this->error )) { |
|
170 | + return; |
|
171 | + } |
|
172 | + if( !glsr( Akismet::class )->isSpam( $this->request )) { |
|
173 | + return; |
|
174 | + } |
|
171 | 175 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
172 | 176 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
173 | 177 | } |
@@ -177,8 +181,12 @@ discard block |
||
177 | 181 | */ |
178 | 182 | protected function validateBlacklist() |
179 | 183 | { |
180 | - if( !empty( $this->error ))return; |
|
181 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
184 | + if( !empty( $this->error )) { |
|
185 | + return; |
|
186 | + } |
|
187 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) { |
|
188 | + return; |
|
189 | + } |
|
182 | 190 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
183 | 191 | if( $blacklistAction == 'reject' ) { |
184 | 192 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -193,9 +201,13 @@ discard block |
||
193 | 201 | */ |
194 | 202 | protected function validateCustom() |
195 | 203 | { |
196 | - if( !empty( $this->error ))return; |
|
204 | + if( !empty( $this->error )) { |
|
205 | + return; |
|
206 | + } |
|
197 | 207 | $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request ); |
198 | - if( $validated === true )return; |
|
208 | + if( $validated === true ) { |
|
209 | + return; |
|
210 | + } |
|
199 | 211 | $this->setSessionValues( 'errors', [] ); |
200 | 212 | $this->setSessionValues( 'values', $this->request ); |
201 | 213 | $this->error = is_string( $validated ) |
@@ -208,8 +220,12 @@ discard block |
||
208 | 220 | */ |
209 | 221 | protected function validateHoneyPot() |
210 | 222 | { |
211 | - if( !empty( $this->error ))return; |
|
212 | - if( empty( $this->request['gotcha'] ))return; |
|
223 | + if( !empty( $this->error )) { |
|
224 | + return; |
|
225 | + } |
|
226 | + if( empty( $this->request['gotcha'] )) { |
|
227 | + return; |
|
228 | + } |
|
213 | 229 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
214 | 230 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
215 | 231 | } |
@@ -219,7 +235,9 @@ discard block |
||
219 | 235 | */ |
220 | 236 | protected function validateRecaptcha() |
221 | 237 | { |
222 | - if( !empty( $this->error ))return; |
|
238 | + if( !empty( $this->error )) { |
|
239 | + return; |
|
240 | + } |
|
223 | 241 | $isValid = $this->isRecaptchaResponseValid(); |
224 | 242 | if( is_null( $isValid )) { |
225 | 243 | $this->setSessionValues( 'recaptcha', 'unset' ); |
@@ -20,7 +20,9 @@ discard block |
||
20 | 20 | $filenames = []; |
21 | 21 | $iterator = new DirectoryIterator( dirname( __FILE__ ).'/Upgrader' ); |
22 | 22 | foreach( $iterator as $fileinfo ) { |
23 | - if( !$fileinfo->isFile() )continue; |
|
23 | + if( !$fileinfo->isFile() ) { |
|
24 | + continue; |
|
25 | + } |
|
24 | 26 | $filenames[] = $fileinfo->getFilename(); |
25 | 27 | } |
26 | 28 | natsort( $filenames ); |
@@ -28,7 +30,9 @@ discard block |
||
28 | 30 | $className = str_replace( '.php', '', $file ); |
29 | 31 | $version = str_replace( ['Upgrade_', '_'], ['', '.'], $className ); |
30 | 32 | $versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions |
31 | - if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return; |
|
33 | + if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' )) { |
|
34 | + return; |
|
35 | + } |
|
32 | 36 | glsr( 'Modules\\Upgrader\\'.$className ); |
33 | 37 | glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix ); |
34 | 38 | }); |
@@ -203,7 +203,9 @@ discard block |
||
203 | 203 | $key = $value; |
204 | 204 | $value = true; |
205 | 205 | } |
206 | - if( !in_array( $key, static::BOOLEAN_ATTRIBUTES ))continue; |
|
206 | + if( !in_array( $key, static::BOOLEAN_ATTRIBUTES )) { |
|
207 | + continue; |
|
208 | + } |
|
207 | 209 | $this->attributes[$key] = wp_validate_boolean( $value ); |
208 | 210 | } |
209 | 211 | } |
@@ -218,7 +220,9 @@ discard block |
||
218 | 220 | $key = $value; |
219 | 221 | $value = ''; |
220 | 222 | } |
221 | - if( !glsr( Helper::class )->startsWith( 'data-', $key ))continue; |
|
223 | + if( !glsr( Helper::class )->startsWith( 'data-', $key )) { |
|
224 | + continue; |
|
225 | + } |
|
222 | 226 | if( is_array( $value )) { |
223 | 227 | $value = json_encode( $value, JSON_HEX_APOS|JSON_NUMERIC_CHECK|JSON_UNESCAPED_SLASHES|JSON_UNESCAPED_UNICODE ); |
224 | 228 | } |
@@ -232,7 +236,9 @@ discard block |
||
232 | 236 | protected function normalizeStringAttributes() |
233 | 237 | { |
234 | 238 | foreach( $this->attributes as $key => $value ) { |
235 | - if( !is_string( $value ))continue; |
|
239 | + if( !is_string( $value )) { |
|
240 | + continue; |
|
241 | + } |
|
236 | 242 | $this->attributes[$key] = trim( $value ); |
237 | 243 | } |
238 | 244 | } |
@@ -243,7 +249,9 @@ discard block |
||
243 | 249 | */ |
244 | 250 | protected function normalizeInputType( $method ) |
245 | 251 | { |
246 | - if( $method != 'input' )return; |
|
252 | + if( $method != 'input' ) { |
|
253 | + return; |
|
254 | + } |
|
247 | 255 | $attributes = wp_parse_args( $this->attributes, ['type' => ''] ); |
248 | 256 | if( !in_array( $attributes['type'], static::INPUT_TYPES )) { |
249 | 257 | $this->attributes['type'] = 'text'; |
@@ -74,9 +74,13 @@ discard block |
||
74 | 74 | { |
75 | 75 | $this->newSettings = $this->getNewSettings(); |
76 | 76 | $this->oldSettings = $this->getOldSettings(); |
77 | - if( empty( $this->oldSettings ))return; |
|
77 | + if( empty( $this->oldSettings )) { |
|
78 | + return; |
|
79 | + } |
|
78 | 80 | foreach( static::MAPPED_SETTINGS as $old => $new ) { |
79 | - if( empty( $this->oldSettings[$old] ))continue; |
|
81 | + if( empty( $this->oldSettings[$old] )) { |
|
82 | + continue; |
|
83 | + } |
|
80 | 84 | $this->newSettings[$new] = $this->oldSettings[$old]; |
81 | 85 | } |
82 | 86 | $this->migrateNotificationSettings(); |
@@ -136,7 +140,9 @@ discard block |
||
136 | 140 | ]; |
137 | 141 | $this->newSettings['settings.general.notifications'] = []; |
138 | 142 | foreach( $notifications as $old => $new ) { |
139 | - if( $this->oldSettings['settings.general.notification'] != $old )continue; |
|
143 | + if( $this->oldSettings['settings.general.notification'] != $old ) { |
|
144 | + continue; |
|
145 | + } |
|
140 | 146 | $this->newSettings['settings.general.notifications'][] = $new; |
141 | 147 | } |
142 | 148 | } |