@@ -50,12 +50,12 @@ discard block |
||
50 | 50 | 'templates/form/submit-button', |
51 | 51 | 'templates/reviews-form', |
52 | 52 | ]; |
53 | - if( !preg_match( '('.implode( '|', $styledViews ).')', $view )) { |
|
53 | + if( !preg_match( '('.implode( '|', $styledViews ).')', $view ) ) { |
|
54 | 54 | return $view; |
55 | 55 | } |
56 | 56 | $views = $this->generatePossibleViews( $view ); |
57 | 57 | foreach( $views as $possibleView ) { |
58 | - if( !file_exists( glsr()->path( $possibleView.'.php' )))continue; |
|
58 | + if( !file_exists( glsr()->path( $possibleView.'.php' ) ) )continue; |
|
59 | 59 | return glsr( Helper::class )->removePrefix( 'views/', $possibleView ); |
60 | 60 | } |
61 | 61 | return $view; |
@@ -88,7 +88,7 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function modifyField( Builder $instance ) |
90 | 90 | { |
91 | - if( !$this->isPublicInstance( $instance ) || empty( array_filter( $this->fields )))return; |
|
91 | + if( !$this->isPublicInstance( $instance ) || empty(array_filter( $this->fields )) )return; |
|
92 | 92 | call_user_func_array( [$this, 'customize'], [&$instance] ); |
93 | 93 | } |
94 | 94 | |
@@ -105,9 +105,9 @@ discard block |
||
105 | 105 | */ |
106 | 106 | protected function customize( Builder $instance ) |
107 | 107 | { |
108 | - $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' )); |
|
108 | + $args = wp_parse_args( $instance->args, array_fill_keys( ['class', 'type'], '' ) ); |
|
109 | 109 | $key = $instance->tag.'_'.$args['type']; |
110 | - $classes = !isset( $this->fields[$key] ) |
|
110 | + $classes = !isset($this->fields[$key]) |
|
111 | 111 | ? $this->fields[$instance->tag] |
112 | 112 | : $this->fields[$key]; |
113 | 113 | $instance->args['class'] = trim( $args['class'].' '.$classes ); |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | $args = wp_parse_args( $instance->args, [ |
142 | 142 | 'is_public' => false, |
143 | 143 | 'is_raw' => false, |
144 | - ]); |
|
144 | + ] ); |
|
145 | 145 | if( is_admin() || !$args['is_public'] || $args['is_raw'] ) { |
146 | 146 | return false; |
147 | 147 | } |
@@ -32,10 +32,10 @@ discard block |
||
32 | 32 | public function filterEnqueuedScripts( $tag, $handle ) |
33 | 33 | { |
34 | 34 | $scripts = [Application::ID.'/google-recaptcha']; |
35 | - if( in_array( $handle, apply_filters( 'site-reviews/async-scripts', $scripts ))) { |
|
35 | + if( in_array( $handle, apply_filters( 'site-reviews/async-scripts', $scripts ) ) ) { |
|
36 | 36 | $tag = str_replace( ' src=', ' async src=', $tag ); |
37 | 37 | } |
38 | - if( in_array( $handle, apply_filters( 'site-reviews/defer-scripts', $scripts ))) { |
|
38 | + if( in_array( $handle, apply_filters( 'site-reviews/defer-scripts', $scripts ) ) ) { |
|
39 | 39 | $tag = str_replace( ' src=', ' defer src=', $tag ); |
40 | 40 | } |
41 | 41 | return $tag; |
@@ -48,7 +48,7 @@ discard block |
||
48 | 48 | */ |
49 | 49 | public function filterFieldOrder( array $config ) |
50 | 50 | { |
51 | - $order = (array)apply_filters( 'site-reviews/submission-form/order', array_keys( $config )); |
|
51 | + $order = (array)apply_filters( 'site-reviews/submission-form/order', array_keys( $config ) ); |
|
52 | 52 | return array_intersect_key( array_merge( array_flip( $order ), $config ), $config ); |
53 | 53 | } |
54 | 54 | |
@@ -96,7 +96,7 @@ discard block |
||
96 | 96 | public function routerSubmitReview( array $request ) |
97 | 97 | { |
98 | 98 | $validated = glsr( ValidateReview::class )->validate( $request ); |
99 | - if( !empty( $validated->error ) || $validated->recaptchaIsUnset )return; |
|
100 | - $this->execute( new CreateReview( $validated->request )); |
|
99 | + if( !empty($validated->error) || $validated->recaptchaIsUnset )return; |
|
100 | + $this->execute( new CreateReview( $validated->request ) ); |
|
101 | 101 | } |
102 | 102 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | $this->validateBlacklist(); |
68 | 68 | $this->validateAkismet(); |
69 | 69 | $this->validateRecaptcha(); |
70 | - if( !empty( $this->error )) { |
|
70 | + if( !empty($this->error) ) { |
|
71 | 71 | $this->setSessionValues( 'message', $this->error ); |
72 | 72 | } |
73 | 73 | return $this; |
@@ -91,8 +91,8 @@ discard block |
||
91 | 91 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) { |
92 | 92 | return static::RECAPTCHA_DISABLED; |
93 | 93 | } |
94 | - if( empty( $this->request['_recaptcha-token'] )) { |
|
95 | - return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 )) |
|
94 | + if( empty($this->request['_recaptcha-token']) ) { |
|
95 | + return $this->request['_counter'] < intval( apply_filters( 'site-reviews/recaptcha/timeout', 5 ) ) |
|
96 | 96 | ? static::RECAPTCHA_EMPTY |
97 | 97 | : static::RECAPTCHA_FAILED; |
98 | 98 | } |
@@ -104,17 +104,17 @@ discard block |
||
104 | 104 | */ |
105 | 105 | protected function getRecaptchaTokenStatus() |
106 | 106 | { |
107 | - $endpoint = add_query_arg([ |
|
107 | + $endpoint = add_query_arg( [ |
|
108 | 108 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
109 | 109 | 'response' => $this->request['_recaptcha-token'], |
110 | 110 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
111 | 111 | ], static::RECAPTCHA_ENDPOINT ); |
112 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
112 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
113 | 113 | glsr_log()->error( $response->get_error_message() ); |
114 | 114 | return static::RECAPTCHA_FAILED; |
115 | 115 | } |
116 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
117 | - if( !empty( $response->success )) { |
|
116 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
117 | + if( !empty($response->success) ) { |
|
118 | 118 | return boolval( $response->success ) |
119 | 119 | ? static::RECAPTCHA_VALID |
120 | 120 | : static::RECAPTCHA_INVALID; |
@@ -132,12 +132,12 @@ discard block |
||
132 | 132 | { |
133 | 133 | $rules = array_intersect_key( |
134 | 134 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES, $request ), |
135 | - array_flip( $this->getOption( 'settings.submissions.required', [] )) |
|
135 | + array_flip( $this->getOption( 'settings.submissions.required', [] ) ) |
|
136 | 136 | ); |
137 | - $excluded = isset( $request['excluded'] ) |
|
137 | + $excluded = isset($request['excluded']) |
|
138 | 138 | ? explode( ',', $request['excluded'] ) |
139 | 139 | : []; |
140 | - return array_diff_key( $rules, array_flip( $excluded )); |
|
140 | + return array_diff_key( $rules, array_flip( $excluded ) ); |
|
141 | 141 | } |
142 | 142 | |
143 | 143 | /** |
@@ -147,7 +147,7 @@ discard block |
||
147 | 147 | { |
148 | 148 | $rules = $this->getValidationRules( $request ); |
149 | 149 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
150 | - if( empty( $errors )) { |
|
150 | + if( empty($errors) ) { |
|
151 | 151 | return true; |
152 | 152 | } |
153 | 153 | $this->setSessionValues( 'errors', $errors ); |
@@ -164,7 +164,7 @@ discard block |
||
164 | 164 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
165 | 165 | { |
166 | 166 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
167 | - if( !empty( $loggedMessage )) { |
|
167 | + if( !empty($loggedMessage) ) { |
|
168 | 168 | glsr_log()->warning( $loggedMessage ); |
169 | 169 | glsr_log()->warning( $this->request ); |
170 | 170 | } |
@@ -175,8 +175,8 @@ discard block |
||
175 | 175 | */ |
176 | 176 | protected function validateAkismet() |
177 | 177 | { |
178 | - if( !empty( $this->error ))return; |
|
179 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
178 | + if( !empty($this->error) )return; |
|
179 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
180 | 180 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
181 | 181 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
182 | 182 | } |
@@ -186,8 +186,8 @@ discard block |
||
186 | 186 | */ |
187 | 187 | protected function validateBlacklist() |
188 | 188 | { |
189 | - if( !empty( $this->error ))return; |
|
190 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
189 | + if( !empty($this->error) )return; |
|
190 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
191 | 191 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
192 | 192 | if( $blacklistAction == 'reject' ) { |
193 | 193 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -202,7 +202,7 @@ discard block |
||
202 | 202 | */ |
203 | 203 | protected function validateCustom() |
204 | 204 | { |
205 | - if( !empty( $this->error ))return; |
|
205 | + if( !empty($this->error) )return; |
|
206 | 206 | $validated = apply_filters( 'site-reviews/validate/custom', true, $this->request ); |
207 | 207 | if( $validated === true )return; |
208 | 208 | $this->setSessionValues( 'errors', [] ); |
@@ -217,8 +217,8 @@ discard block |
||
217 | 217 | */ |
218 | 218 | protected function validateHoneyPot() |
219 | 219 | { |
220 | - if( !empty( $this->error ))return; |
|
221 | - if( empty( $this->request['gotcha'] ))return; |
|
220 | + if( !empty($this->error) )return; |
|
221 | + if( empty($this->request['gotcha']) )return; |
|
222 | 222 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
223 | 223 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
224 | 224 | } |
@@ -228,9 +228,9 @@ discard block |
||
228 | 228 | */ |
229 | 229 | protected function validateRecaptcha() |
230 | 230 | { |
231 | - if( !empty( $this->error ))return; |
|
231 | + if( !empty($this->error) )return; |
|
232 | 232 | $status = $this->getRecaptchaStatus(); |
233 | - if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ))return; |
|
233 | + if( in_array( $status, [static::RECAPTCHA_DISABLED, static::RECAPTCHA_VALID] ) )return; |
|
234 | 234 | if( $status == static::RECAPTCHA_EMPTY ) { |
235 | 235 | $this->setSessionValues( 'recaptcha', 'unset' ); |
236 | 236 | $this->recaptchaIsUnset = true; |
@@ -250,11 +250,11 @@ discard block |
||
250 | 250 | */ |
251 | 251 | protected function validateRequest( array $request ) |
252 | 252 | { |
253 | - if( !$this->isRequestValid( $request )) { |
|
253 | + if( !$this->isRequestValid( $request ) ) { |
|
254 | 254 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
255 | 255 | return $request; |
256 | 256 | } |
257 | - if( empty( $request['title'] )) { |
|
257 | + if( empty($request['title']) ) { |
|
258 | 258 | $request['title'] = __( 'No Title', 'site-reviews' ); |
259 | 259 | } |
260 | 260 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -12,7 +12,7 @@ |
||
12 | 12 | */ |
13 | 13 | public function build( array $args = [] ) |
14 | 14 | { |
15 | - require_once( ABSPATH.'wp-admin/includes/template.php' ); |
|
15 | + require_once(ABSPATH.'wp-admin/includes/template.php'); |
|
16 | 16 | ob_start(); |
17 | 17 | wp_star_rating( $args ); |
18 | 18 | $stars = ob_get_clean(); |
@@ -65,7 +65,7 @@ discard block |
||
65 | 65 | 'response' => $this->buildResponse(), |
66 | 66 | 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(), |
67 | 67 | ], |
68 | - ]); |
|
68 | + ] ); |
|
69 | 69 | } |
70 | 70 | |
71 | 71 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | 'context' => [ |
78 | 78 | 'text' => trim( $this->getLoginText().' '.$this->getRegisterText() ), |
79 | 79 | ], |
80 | - ]); |
|
80 | + ] ); |
|
81 | 81 | } |
82 | 82 | |
83 | 83 | /** |
@@ -86,12 +86,12 @@ discard block |
||
86 | 86 | protected function buildRecaptcha() |
87 | 87 | { |
88 | 88 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return; |
89 | - return glsr( Builder::class )->div([ |
|
89 | + return glsr( Builder::class )->div( [ |
|
90 | 90 | 'class' => 'glsr-recaptcha-holder', |
91 | 91 | 'data-badge' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ), |
92 | - 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )), |
|
92 | + 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ), |
|
93 | 93 | 'data-size' => 'invisible', |
94 | - ]); |
|
94 | + ] ); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -99,7 +99,7 @@ discard block |
||
99 | 99 | */ |
100 | 100 | protected function buildResponse() |
101 | 101 | { |
102 | - $classes = !empty( $this->errors ) |
|
102 | + $classes = !empty($this->errors) |
|
103 | 103 | ? glsr( StyleValidationDefaults::class )->defaults()['message_error_class'] |
104 | 104 | : ''; |
105 | 105 | return glsr( Template::class )->build( 'templates/form/response', [ |
@@ -107,8 +107,8 @@ discard block |
||
107 | 107 | 'class' => $classes, |
108 | 108 | 'message' => wpautop( $this->message ), |
109 | 109 | ], |
110 | - 'has_errors' => !empty( $this->errors ), |
|
111 | - ]); |
|
110 | + 'has_errors' => !empty($this->errors), |
|
111 | + ] ); |
|
112 | 112 | } |
113 | 113 | |
114 | 114 | /** |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | 'context' => [ |
121 | 121 | 'text' => __( 'Submit your review', 'site-reviews' ), |
122 | 122 | ], |
123 | - ]); |
|
123 | + ] ); |
|
124 | 124 | } |
125 | 125 | |
126 | 126 | /** |
@@ -138,14 +138,14 @@ discard block |
||
138 | 138 | { |
139 | 139 | $hiddenFields = $this->getHiddenFields(); |
140 | 140 | $hiddenFields[] = $this->getHoneypotField(); |
141 | - $fields = $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )); |
|
141 | + $fields = $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ); |
|
142 | 142 | $paths = array_map( function( $obj ) { |
143 | 143 | return $obj->field['path']; |
144 | 144 | }, $hiddenFields ); |
145 | 145 | foreach( $fields as $field ) { |
146 | 146 | $index = array_search( $field->field['path'], $paths ); |
147 | 147 | if( $index === false )continue; |
148 | - unset( $hiddenFields[$index] ); |
|
148 | + unset($hiddenFields[$index]); |
|
149 | 149 | } |
150 | 150 | return array_merge( $hiddenFields, $fields ); |
151 | 151 | } |
@@ -155,10 +155,10 @@ discard block |
||
155 | 155 | */ |
156 | 156 | protected function getLoginText() |
157 | 157 | { |
158 | - $loginLink = glsr( Builder::class )->a([ |
|
159 | - 'href' => wp_login_url( strval( get_permalink() )), |
|
158 | + $loginLink = glsr( Builder::class )->a( [ |
|
159 | + 'href' => wp_login_url( strval( get_permalink() ) ), |
|
160 | 160 | 'text' => __( 'logged in', 'site-reviews' ), |
161 | - ]); |
|
161 | + ] ); |
|
162 | 162 | return sprintf( __( 'You must be %s to submit a review.', 'site-reviews' ), $loginLink ); |
163 | 163 | } |
164 | 164 | |
@@ -168,10 +168,10 @@ discard block |
||
168 | 168 | protected function getRegisterText() |
169 | 169 | { |
170 | 170 | if( !get_option( 'users_can_register' ) || glsr( OptionManager::class )->get( 'settings.general.require.login' ) != 'yes' )return; |
171 | - $registerLink = glsr( Builder::class )->a([ |
|
171 | + $registerLink = glsr( Builder::class )->a( [ |
|
172 | 172 | 'href' => wp_registration_url(), |
173 | 173 | 'text' => __( 'register', 'site-reviews' ), |
174 | - ]); |
|
174 | + ] ); |
|
175 | 175 | return sprintf( __( 'You may also %s for an account.', 'site-reviews' ), $registerLink ); |
176 | 176 | } |
177 | 177 | |
@@ -183,32 +183,32 @@ discard block |
||
183 | 183 | $fields = [[ |
184 | 184 | 'name' => '_action', |
185 | 185 | 'value' => 'submit-review', |
186 | - ],[ |
|
186 | + ], [ |
|
187 | 187 | 'name' => '_counter', |
188 | - ],[ |
|
188 | + ], [ |
|
189 | 189 | 'name' => '_nonce', |
190 | 190 | 'value' => wp_create_nonce( 'submit-review' ), |
191 | - ],[ |
|
191 | + ], [ |
|
192 | 192 | 'name' => '_post_id', |
193 | 193 | 'value' => get_the_ID(), |
194 | - ],[ |
|
194 | + ], [ |
|
195 | 195 | 'name' => '_referer', |
196 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), |
|
197 | - ],[ |
|
196 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), |
|
197 | + ], [ |
|
198 | 198 | 'name' => 'assign_to', |
199 | 199 | 'value' => $this->args['assign_to'], |
200 | - ],[ |
|
200 | + ], [ |
|
201 | 201 | 'name' => 'category', |
202 | 202 | 'value' => $this->args['category'], |
203 | - ],[ |
|
203 | + ], [ |
|
204 | 204 | 'name' => 'excluded', |
205 | 205 | 'value' => $this->args['hide'], |
206 | - ],[ |
|
206 | + ], [ |
|
207 | 207 | 'name' => 'form_id', |
208 | 208 | 'value' => $this->args['id'], |
209 | 209 | ]]; |
210 | 210 | return array_map( function( $field ) { |
211 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
211 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
212 | 212 | }, $fields ); |
213 | 213 | } |
214 | 214 | |
@@ -217,10 +217,10 @@ discard block |
||
217 | 217 | */ |
218 | 218 | protected function getHoneypotField() |
219 | 219 | { |
220 | - return new Field([ |
|
220 | + return new Field( [ |
|
221 | 221 | 'name' => 'gotcha', |
222 | 222 | 'type' => 'honeypot', |
223 | - ]); |
|
223 | + ] ); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -228,8 +228,8 @@ discard block |
||
228 | 228 | */ |
229 | 229 | protected function normalizeFieldId( Field &$field ) |
230 | 230 | { |
231 | - if( empty( $this->args['id'] ) || empty( $field->field['id'] ))return; |
|
232 | - $field->field['id'].= '-'.$this->args['id']; |
|
231 | + if( empty($this->args['id']) || empty($field->field['id']) )return; |
|
232 | + $field->field['id'] .= '-'.$this->args['id']; |
|
233 | 233 | } |
234 | 234 | |
235 | 235 | /** |
@@ -237,7 +237,7 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function normalizeFieldClass( Field &$field ) |
239 | 239 | { |
240 | - if( !isset( $field->field['class'] )) { |
|
240 | + if( !isset($field->field['class']) ) { |
|
241 | 241 | $field->field['class'] = ''; |
242 | 242 | } |
243 | 243 | $field->field['class'] = trim( $field->field['class'].' glsr-field-control' ); |
@@ -248,7 +248,7 @@ discard block |
||
248 | 248 | */ |
249 | 249 | protected function normalizeFieldErrors( Field &$field ) |
250 | 250 | { |
251 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
251 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
252 | 252 | $field->field['errors'] = $this->errors[$field->field['path']]; |
253 | 253 | } |
254 | 254 | |
@@ -257,7 +257,7 @@ discard block |
||
257 | 257 | */ |
258 | 258 | protected function normalizeFieldRequired( Field &$field ) |
259 | 259 | { |
260 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
260 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
261 | 261 | $field->field['required'] = true; |
262 | 262 | } |
263 | 263 | |
@@ -268,7 +268,7 @@ discard block |
||
268 | 268 | { |
269 | 269 | $normalizedFields = []; |
270 | 270 | foreach( $fields as $field ) { |
271 | - if( in_array( $field->field['path'], $this->args['hide'] ))continue; |
|
271 | + if( in_array( $field->field['path'], $this->args['hide'] ) )continue; |
|
272 | 272 | $field->field['is_public'] = true; |
273 | 273 | $this->normalizeFieldClass( $field ); |
274 | 274 | $this->normalizeFieldErrors( $field ); |
@@ -285,8 +285,8 @@ discard block |
||
285 | 285 | */ |
286 | 286 | protected function normalizeFieldValue( Field &$field ) |
287 | 287 | { |
288 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
289 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
288 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
289 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
290 | 290 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
291 | 291 | } |
292 | 292 | else { |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | public function routeAdminPostRequest() |
18 | 18 | { |
19 | 19 | $request = $this->getRequest(); |
20 | - if( !$this->isValidPostRequest( $request ))return; |
|
20 | + if( !$this->isValidPostRequest( $request ) )return; |
|
21 | 21 | check_admin_referer( $request['_action'] ); |
22 | 22 | $this->routeRequest( 'admin', $request['_action'], $request ); |
23 | 23 | } |
@@ -41,8 +41,8 @@ discard block |
||
41 | 41 | { |
42 | 42 | if( is_admin() )return; |
43 | 43 | $request = $this->getRequest(); |
44 | - if( !$this->isValidPostRequest( $request ))return; |
|
45 | - if( !$this->isValidPublicNonce( $request ))return; |
|
44 | + if( !$this->isValidPostRequest( $request ) )return; |
|
45 | + if( !$this->isValidPublicNonce( $request ) )return; |
|
46 | 46 | $this->routeRequest( 'public', $request['_action'], $request ); |
47 | 47 | } |
48 | 48 | |
@@ -52,10 +52,10 @@ discard block |
||
52 | 52 | protected function checkAjaxNonce( array $request ) |
53 | 53 | { |
54 | 54 | if( !is_user_logged_in() )return; |
55 | - if( !isset( $request['_nonce'] )) { |
|
55 | + if( !isset($request['_nonce']) ) { |
|
56 | 56 | $this->sendAjaxError( 'request is missing a nonce', $request ); |
57 | 57 | } |
58 | - if( !wp_verify_nonce( $request['_nonce'], $request['_action'] )) { |
|
58 | + if( !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
59 | 59 | $this->sendAjaxError( 'request failed the nonce check', $request, 403 ); |
60 | 60 | } |
61 | 61 | } |
@@ -65,10 +65,10 @@ discard block |
||
65 | 65 | */ |
66 | 66 | protected function checkAjaxRequest( array $request ) |
67 | 67 | { |
68 | - if( !isset( $request['_action'] )) { |
|
68 | + if( !isset($request['_action']) ) { |
|
69 | 69 | $this->sendAjaxError( 'request must include an action', $request ); |
70 | 70 | } |
71 | - if( empty( $request['_ajax_request'] )) { |
|
71 | + if( empty($request['_ajax_request']) ) { |
|
72 | 72 | $this->sendAjaxError( 'request is invalid', $request ); |
73 | 73 | } |
74 | 74 | } |
@@ -95,7 +95,7 @@ discard block |
||
95 | 95 | */ |
96 | 96 | protected function isValidPostRequest( array $request = [] ) |
97 | 97 | { |
98 | - return !empty( $request['_action'] ) && empty( $request['_ajax_request'] ); |
|
98 | + return !empty($request['_action']) && empty($request['_ajax_request']); |
|
99 | 99 | } |
100 | 100 | |
101 | 101 | /** |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | */ |
104 | 104 | protected function isValidPublicNonce( array $request ) |
105 | 105 | { |
106 | - if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] )) { |
|
106 | + if( is_user_logged_in() && !wp_verify_nonce( $request['_nonce'], $request['_action'] ) ) { |
|
107 | 107 | glsr_log()->error( 'nonce check failed for public request' )->debug( $request ); |
108 | 108 | return false; |
109 | 109 | } |
@@ -118,11 +118,11 @@ discard block |
||
118 | 118 | protected function routeRequest( $type, $action, array $request = [] ) |
119 | 119 | { |
120 | 120 | $actionHook = 'site-reviews/route/'.$type.'/request'; |
121 | - $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' )); |
|
121 | + $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) ); |
|
122 | 122 | $method = glsr( Helper::class )->buildMethodName( $action, 'router' ); |
123 | 123 | $request = apply_filters( 'site-reviews/route/request', $request, $action, $type ); |
124 | 124 | do_action( $actionHook, $action, $request ); |
125 | - if( is_callable( [$controller, $method] )) { |
|
125 | + if( is_callable( [$controller, $method] ) ) { |
|
126 | 126 | call_user_func( [$controller, $method], $request ); |
127 | 127 | return; |
128 | 128 | } |
@@ -140,10 +140,10 @@ discard block |
||
140 | 140 | { |
141 | 141 | glsr_log()->error( $error )->debug( $request ); |
142 | 142 | glsr( Notice::class )->addError( __( 'There was an error (try refreshing the page).', 'site-reviews' ).' <code>'.$error.'</code>' ); |
143 | - wp_send_json_error([ |
|
143 | + wp_send_json_error( [ |
|
144 | 144 | 'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ), |
145 | 145 | 'notices' => glsr( Notice::class )->get(), |
146 | 146 | 'error' => $error, |
147 | - ]); |
|
147 | + ] ); |
|
148 | 148 | } |
149 | 149 | } |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | */ |
28 | 28 | public function enqueueAssets() |
29 | 29 | { |
30 | - if( apply_filters( 'site-reviews/assets/css', true )) { |
|
30 | + if( apply_filters( 'site-reviews/assets/css', true ) ) { |
|
31 | 31 | wp_enqueue_style( |
32 | 32 | Application::ID, |
33 | 33 | $this->getStylesheet(), |
@@ -35,7 +35,7 @@ discard block |
||
35 | 35 | glsr()->version |
36 | 36 | ); |
37 | 37 | } |
38 | - if( apply_filters( 'site-reviews/assets/js', true )) { |
|
38 | + if( apply_filters( 'site-reviews/assets/js', true ) ) { |
|
39 | 39 | $dependencies = apply_filters( 'site-reviews/assets/polyfill', true ) |
40 | 40 | ? [Application::ID.'/polyfill'] |
41 | 41 | : []; |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function enqueuePolyfillService() |
57 | 57 | { |
58 | - if( !apply_filters( 'site-reviews/assets/polyfill', true ))return; |
|
59 | - wp_enqueue_script( Application::ID.'/polyfill', add_query_arg([ |
|
58 | + if( !apply_filters( 'site-reviews/assets/polyfill', true ) )return; |
|
59 | + wp_enqueue_script( Application::ID.'/polyfill', add_query_arg( [ |
|
60 | 60 | 'features' => 'CustomEvent,Element.prototype.closest,Element.prototype.dataset,Event,MutationObserver', |
61 | 61 | 'flags' => 'gated', |
62 | - ], 'https://cdn.polyfill.io/v2/polyfill.min.js' )); |
|
62 | + ], 'https://cdn.polyfill.io/v2/polyfill.min.js' ) ); |
|
63 | 63 | } |
64 | 64 | |
65 | 65 | /** |
@@ -72,10 +72,10 @@ discard block |
||
72 | 72 | // nf-google-recaptcha |
73 | 73 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() )return; |
74 | 74 | $language = apply_filters( 'site-reviews/recaptcha/language', get_locale() ); |
75 | - wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg([ |
|
75 | + wp_enqueue_script( Application::ID.'/google-recaptcha', add_query_arg( [ |
|
76 | 76 | 'hl' => $language, |
77 | 77 | 'render' => 'explicit', |
78 | - ], 'https://www.google.com/recaptcha/api.js' )); |
|
78 | + ], 'https://www.google.com/recaptcha/api.js' ) ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -84,8 +84,8 @@ discard block |
||
84 | 84 | public function inlineStyles() |
85 | 85 | { |
86 | 86 | $inlineStylesheetPath = glsr()->path( 'assets/styles/inline-styles.css' ); |
87 | - if( !apply_filters( 'site-reviews/assets/css', true ))return; |
|
88 | - if( !file_exists( $inlineStylesheetPath )) { |
|
87 | + if( !apply_filters( 'site-reviews/assets/css', true ) )return; |
|
88 | + if( !file_exists( $inlineStylesheetPath ) ) { |
|
89 | 89 | glsr_log()->error( 'Inline stylesheet is missing: '.$inlineStylesheetPath ); |
90 | 90 | return; |
91 | 91 | } |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | */ |
121 | 121 | protected function getFixedSelectorsForPagination() |
122 | 122 | { |
123 | - $selectors = ['#wpadminbar','.site-navigation-fixed']; |
|
123 | + $selectors = ['#wpadminbar', '.site-navigation-fixed']; |
|
124 | 124 | return apply_filters( 'site-reviews/enqueue/public/localize/ajax-pagination', $selectors ); |
125 | 125 | } |
126 | 126 | |
@@ -130,7 +130,7 @@ discard block |
||
130 | 130 | protected function getStylesheet() |
131 | 131 | { |
132 | 132 | $currentStyle = glsr( Style::class )->style; |
133 | - return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' )) |
|
133 | + return file_exists( glsr()->path( 'assets/styles/custom/'.$currentStyle.'.css' ) ) |
|
134 | 134 | ? glsr()->url( 'assets/styles/custom/'.$currentStyle.'.css' ) |
135 | 135 | : glsr()->url( 'assets/styles/'.Application::ID.'.css' ); |
136 | 136 | } |
@@ -19,7 +19,7 @@ discard block |
||
19 | 19 | */ |
20 | 20 | add_filter( 'sbp_exclude_defer_scripts', function( $scriptHandles ) { |
21 | 21 | $scriptHandles[] = 'site-reviews/google-recaptcha'; |
22 | - return array_keys( array_flip( $scriptHandles )); |
|
22 | + return array_keys( array_flip( $scriptHandles ) ); |
|
23 | 23 | }); |
24 | 24 | |
25 | 25 | /** |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | * @see https://searchandfilter.com/ |
30 | 30 | */ |
31 | 31 | add_filter( 'sf_edit_query_args', function( $query ) { |
32 | - if( !empty( $query['meta_key'] ) && $query['meta_key'] == '_glsr_ranking' ) { |
|
33 | - unset( $query['meta_key'] ); |
|
32 | + if( !empty($query['meta_key']) && $query['meta_key'] == '_glsr_ranking' ) { |
|
33 | + unset($query['meta_key']); |
|
34 | 34 | $query['meta_query'] = [ |
35 | 35 | 'relation' => 'OR', |
36 | 36 | ['key' => '_glsr_ranking', 'compare' => 'EXISTS'], |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $className = str_replace( '.php', '', $file ); |
25 | 25 | $version = str_replace( ['Upgrade_', '_'], ['', '.'], $className ); |
26 | 26 | $versionSuffix = preg_replace( '/[\d.]+(.+)?/', '${1}', glsr()->version ); // allow alpha/beta versions |
27 | - if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ))return; |
|
27 | + if( version_compare( $this->currentVersion(), $version.$versionSuffix, '>=' ) )return; |
|
28 | 28 | glsr( 'Modules\\Upgrader\\'.$className ); |
29 | 29 | glsr_log()->info( 'Completed Upgrade for v'.$version.$versionSuffix ); |
30 | 30 | }); |
@@ -45,10 +45,10 @@ discard block |
||
45 | 45 | */ |
46 | 46 | public function setReviewCounts() |
47 | 47 | { |
48 | - if( !empty( glsr( OptionManager::class )->get( 'last_review_count' )))return; |
|
48 | + if( !empty(glsr( OptionManager::class )->get( 'last_review_count' )) )return; |
|
49 | 49 | add_action( 'admin_init', function() { |
50 | 50 | glsr( AdminController::class )->routerCountReviews( false ); |
51 | - glsr_log()->info( __( 'Calculated rating counts.', 'site-reviews' )); |
|
51 | + glsr_log()->info( __( 'Calculated rating counts.', 'site-reviews' ) ); |
|
52 | 52 | }); |
53 | 53 | } |
54 | 54 |