@@ -13,7 +13,7 @@ |
||
13 | 13 | */ |
14 | 14 | public function __call( $name, array $args = [] ) |
15 | 15 | { |
16 | - if( !method_exists( $this, $name ))return; |
|
16 | + if( !method_exists( $this, $name ) )return; |
|
17 | 17 | $defaults = call_user_func_array( [$this, $name], $args ); |
18 | 18 | $className = (new ReflectionClass( $this ))->getShortName(); |
19 | 19 | $className = str_replace( 'Defaults', '', $className ); |
@@ -13,7 +13,9 @@ |
||
13 | 13 | */ |
14 | 14 | public function __call( $name, array $args = [] ) |
15 | 15 | { |
16 | - if( !method_exists( $this, $name ))return; |
|
16 | + if( !method_exists( $this, $name )) { |
|
17 | + return; |
|
18 | + } |
|
17 | 19 | $defaults = call_user_func_array( [$this, $name], $args ); |
18 | 20 | $className = (new ReflectionClass( $this ))->getShortName(); |
19 | 21 | $className = str_replace( 'Defaults', '', $className ); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function routerChangeStatus( array $request ) |
24 | 24 | { |
25 | - wp_send_json_success( $this->execute( new ChangeStatus( $request ))); |
|
25 | + wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) ); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | public function routerClearConsole() |
32 | 32 | { |
33 | 33 | glsr( AdminController::class )->routerClearConsole(); |
34 | - wp_send_json_success([ |
|
34 | + wp_send_json_success( [ |
|
35 | 35 | 'console' => glsr( Console::class )->get(), |
36 | 36 | 'notices' => glsr( Notice::class )->get(), |
37 | - ]); |
|
37 | + ] ); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -43,9 +43,9 @@ discard block |
||
43 | 43 | public function routerCountReviews() |
44 | 44 | { |
45 | 45 | glsr( AdminController::class )->routerCountReviews(); |
46 | - wp_send_json_success([ |
|
46 | + wp_send_json_success( [ |
|
47 | 47 | 'notices' => glsr( Notice::class )->get(), |
48 | - ]); |
|
48 | + ] ); |
|
49 | 49 | } |
50 | 50 | |
51 | 51 | /** |
@@ -55,9 +55,9 @@ discard block |
||
55 | 55 | { |
56 | 56 | $shortcode = $request['shortcode']; |
57 | 57 | $response = false; |
58 | - if( array_key_exists( $shortcode, glsr()->mceShortcodes )) { |
|
58 | + if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) { |
|
59 | 59 | $data = glsr()->mceShortcodes[$shortcode]; |
60 | - if( !empty( $data['errors'] )) { |
|
60 | + if( !empty($data['errors']) ) { |
|
61 | 61 | $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )]; |
62 | 62 | } |
63 | 63 | $response = [ |
@@ -77,10 +77,10 @@ discard block |
||
77 | 77 | public function routerFetchConsole() |
78 | 78 | { |
79 | 79 | glsr( AdminController::class )->routerFetchConsole(); |
80 | - wp_send_json_success([ |
|
80 | + wp_send_json_success( [ |
|
81 | 81 | 'console' => glsr( Console::class )->get(), |
82 | 82 | 'notices' => glsr( Notice::class )->get(), |
83 | - ]); |
|
83 | + ] ); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -89,10 +89,10 @@ discard block |
||
89 | 89 | public function routerSearchPosts( array $request ) |
90 | 90 | { |
91 | 91 | $results = glsr( Database::class )->searchPosts( $request['search'] ); |
92 | - wp_send_json_success([ |
|
92 | + wp_send_json_success( [ |
|
93 | 93 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
94 | 94 | 'items' => $results, |
95 | - ]); |
|
95 | + ] ); |
|
96 | 96 | } |
97 | 97 | |
98 | 98 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | */ |
101 | 101 | public function routerSearchTranslations( array $request ) |
102 | 102 | { |
103 | - if( empty( $request['exclude'] )) { |
|
103 | + if( empty($request['exclude']) ) { |
|
104 | 104 | $request['exclude'] = []; |
105 | 105 | } |
106 | 106 | $results = glsr( Translator::class ) |
@@ -108,10 +108,10 @@ discard block |
||
108 | 108 | ->exclude() |
109 | 109 | ->exclude( $request['exclude'] ) |
110 | 110 | ->renderResults(); |
111 | - wp_send_json_success([ |
|
111 | + wp_send_json_success( [ |
|
112 | 112 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
113 | 113 | 'items' => $results, |
114 | - ]); |
|
114 | + ] ); |
|
115 | 115 | } |
116 | 116 | |
117 | 117 | /** |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | 'message' => glsr( Session::class )->get( $request['form_id'].'message', '', true ), |
126 | 126 | 'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ), |
127 | 127 | ]; |
128 | - if( !wp_validate_boolean( $data['errors'] )) { |
|
128 | + if( !wp_validate_boolean( $data['errors'] ) ) { |
|
129 | 129 | glsr( Session::class )->clear(); |
130 | 130 | wp_send_json_success( $data ); |
131 | 131 | } |
@@ -137,10 +137,10 @@ discard block |
||
137 | 137 | */ |
138 | 138 | public function routerTogglePinned( array $request ) |
139 | 139 | { |
140 | - $isPinned = $this->execute( new TogglePinned( $request )); |
|
141 | - wp_send_json_success([ |
|
140 | + $isPinned = $this->execute( new TogglePinned( $request ) ); |
|
141 | + wp_send_json_success( [ |
|
142 | 142 | 'notices' => glsr( Notice::class )->get(), |
143 | 143 | 'pinned' => $isPinned, |
144 | - ]); |
|
144 | + ] ); |
|
145 | 145 | } |
146 | 146 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | $this->validateBlacklist(); |
62 | 62 | $this->validateAkismet(); |
63 | 63 | $this->validateRecaptcha(); |
64 | - if( !empty( $this->error )) { |
|
64 | + if( !empty($this->error) ) { |
|
65 | 65 | $this->setSessionValues( 'message', $this->error ); |
66 | 66 | } |
67 | 67 | return $this; |
@@ -84,12 +84,12 @@ discard block |
||
84 | 84 | { |
85 | 85 | $rules = array_intersect_key( |
86 | 86 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
87 | - array_flip( $this->getOption( 'settings.submissions.required', [] )) |
|
87 | + array_flip( $this->getOption( 'settings.submissions.required', [] ) ) |
|
88 | 88 | ); |
89 | - $excluded = isset( $request['excluded'] ) |
|
89 | + $excluded = isset($request['excluded']) |
|
90 | 90 | ? (array)json_decode( $request['excluded'] ) |
91 | 91 | : []; |
92 | - return array_diff_key( $rules, array_flip( $excluded )); |
|
92 | + return array_diff_key( $rules, array_flip( $excluded ) ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -100,7 +100,7 @@ discard block |
||
100 | 100 | if( !glsr( OptionManager::class )->isRecaptchaEnabled() ) { |
101 | 101 | return true; |
102 | 102 | } |
103 | - if( empty( $this->request['recaptcha-token'] )) { |
|
103 | + if( empty($this->request['recaptcha-token']) ) { |
|
104 | 104 | return null; // @see $this->validateRecaptcha() |
105 | 105 | } |
106 | 106 | return $this->isRecaptchaValid( $this->request['recaptcha-token'] ); |
@@ -112,17 +112,17 @@ discard block |
||
112 | 112 | */ |
113 | 113 | protected function isRecaptchaValid( $recaptchaToken ) |
114 | 114 | { |
115 | - $endpoint = add_query_arg([ |
|
115 | + $endpoint = add_query_arg( [ |
|
116 | 116 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
117 | 117 | 'response' => $recaptchaToken, |
118 | 118 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
119 | 119 | ], static::RECAPTCHA_ENDPOINT ); |
120 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
120 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
121 | 121 | glsr_log()->error( $response->get_error_message() ); |
122 | 122 | return false; |
123 | 123 | } |
124 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
125 | - if( !empty( $response->success )) { |
|
124 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
125 | + if( !empty($response->success) ) { |
|
126 | 126 | return boolval( $response->success ); |
127 | 127 | } |
128 | 128 | foreach( $response->{'error-codes'} as $error ) { |
@@ -138,7 +138,7 @@ discard block |
||
138 | 138 | { |
139 | 139 | $rules = $this->getValidationRules( $request ); |
140 | 140 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
141 | - if( empty( $errors )) { |
|
141 | + if( empty($errors) ) { |
|
142 | 142 | return true; |
143 | 143 | } |
144 | 144 | $this->setSessionValues( 'errors', $errors ); |
@@ -155,7 +155,7 @@ discard block |
||
155 | 155 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
156 | 156 | { |
157 | 157 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
158 | - if( !empty( $loggedMessage )) { |
|
158 | + if( !empty($loggedMessage) ) { |
|
159 | 159 | glsr_log()->warning( $loggedMessage ); |
160 | 160 | glsr_log()->warning( $this->request ); |
161 | 161 | } |
@@ -166,8 +166,8 @@ 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) )return; |
|
170 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
171 | 171 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
172 | 172 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
173 | 173 | } |
@@ -177,8 +177,8 @@ discard block |
||
177 | 177 | */ |
178 | 178 | protected function validateBlacklist() |
179 | 179 | { |
180 | - if( !empty( $this->error ))return; |
|
181 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
180 | + if( !empty($this->error) )return; |
|
181 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
182 | 182 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
183 | 183 | if( $blacklistAction == 'reject' ) { |
184 | 184 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -193,7 +193,7 @@ discard block |
||
193 | 193 | */ |
194 | 194 | protected function validateCustom() |
195 | 195 | { |
196 | - if( !empty( $this->error ))return; |
|
196 | + if( !empty($this->error) )return; |
|
197 | 197 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
198 | 198 | if( $validated === true )return; |
199 | 199 | $this->setSessionValues( 'errors', [] ); |
@@ -208,8 +208,8 @@ discard block |
||
208 | 208 | */ |
209 | 209 | protected function validateHoneyPot() |
210 | 210 | { |
211 | - if( !empty( $this->error ))return; |
|
212 | - if( empty( $this->request['gotcha'] ))return; |
|
211 | + if( !empty($this->error) )return; |
|
212 | + if( empty($this->request['gotcha']) )return; |
|
213 | 213 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
214 | 214 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
215 | 215 | } |
@@ -219,9 +219,9 @@ discard block |
||
219 | 219 | */ |
220 | 220 | protected function validateRecaptcha() |
221 | 221 | { |
222 | - if( !empty( $this->error ))return; |
|
222 | + if( !empty($this->error) )return; |
|
223 | 223 | $isValid = $this->isRecaptchaResponseValid(); |
224 | - if( is_null( $isValid )) { |
|
224 | + if( is_null( $isValid ) ) { |
|
225 | 225 | $this->setSessionValues( 'recaptcha', 'unset' ); |
226 | 226 | $this->recaptchaIsUnset = true; |
227 | 227 | } |
@@ -237,11 +237,11 @@ discard block |
||
237 | 237 | */ |
238 | 238 | protected function validateRequest( array $request ) |
239 | 239 | { |
240 | - if( !$this->isRequestValid( $request )) { |
|
240 | + if( !$this->isRequestValid( $request ) ) { |
|
241 | 241 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
242 | 242 | return $request; |
243 | 243 | } |
244 | - if( empty( $request['title'] )) { |
|
244 | + if( empty($request['title']) ) { |
|
245 | 245 | $request['title'] = __( 'No Title', 'site-reviews' ); |
246 | 246 | } |
247 | 247 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -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/review/submission', 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' ); |
@@ -27,21 +27,21 @@ discard block |
||
27 | 27 | public function __construct( $input ) |
28 | 28 | { |
29 | 29 | $this->request = $input; |
30 | - $this->ajax_request = isset( $input['ajax_request'] ); |
|
30 | + $this->ajax_request = isset($input['ajax_request']); |
|
31 | 31 | $this->assigned_to = $this->getNumeric( 'assign_to' ); |
32 | - $this->author = sanitize_text_field( $this->get( 'name' )); |
|
33 | - $this->avatar = get_avatar_url( $this->get( 'email' )); |
|
34 | - $this->blacklisted = isset( $input['blacklisted'] ); |
|
35 | - $this->category = sanitize_key( $this->get( 'category' )); |
|
36 | - $this->content = sanitize_textarea_field( $this->get( 'content' )); |
|
32 | + $this->author = sanitize_text_field( $this->get( 'name' ) ); |
|
33 | + $this->avatar = get_avatar_url( $this->get( 'email' ) ); |
|
34 | + $this->blacklisted = isset($input['blacklisted']); |
|
35 | + $this->category = sanitize_key( $this->get( 'category' ) ); |
|
36 | + $this->content = sanitize_textarea_field( $this->get( 'content' ) ); |
|
37 | 37 | $this->custom = $this->getCustom(); |
38 | - $this->email = sanitize_email( $this->get( 'email' )); |
|
39 | - $this->form_id = sanitize_key( $this->get( 'form_id' )); |
|
38 | + $this->email = sanitize_email( $this->get( 'email' ) ); |
|
39 | + $this->form_id = sanitize_key( $this->get( 'form_id' ) ); |
|
40 | 40 | $this->ip_address = $this->get( 'ip_address' ); |
41 | - $this->rating = intval( $this->get( 'rating' )); |
|
41 | + $this->rating = intval( $this->get( 'rating' ) ); |
|
42 | 42 | $this->referer = $this->get( 'referer' ); |
43 | - $this->terms = isset( $input['terms'] ); |
|
44 | - $this->title = sanitize_text_field( $this->get( 'title' )); |
|
43 | + $this->terms = isset($input['terms']); |
|
44 | + $this->title = sanitize_text_field( $this->get( 'title' ) ); |
|
45 | 45 | } |
46 | 46 | |
47 | 47 | /** |
@@ -50,7 +50,7 @@ discard block |
||
50 | 50 | */ |
51 | 51 | protected function get( $key ) |
52 | 52 | { |
53 | - return isset( $this->request[$key] ) |
|
53 | + return isset($this->request[$key]) |
|
54 | 54 | ? (string)$this->request[$key] |
55 | 55 | : ''; |
56 | 56 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | ]; |
68 | 68 | $custom = $this->request; |
69 | 69 | foreach( $unset as $value ) { |
70 | - unset( $custom[$value] ); |
|
70 | + unset($custom[$value]); |
|
71 | 71 | } |
72 | 72 | return $custom; |
73 | 73 | } |
@@ -17,7 +17,9 @@ 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 )) { |
|
21 | + return; |
|
22 | + } |
|
21 | 23 | check_admin_referer( $request['action'] ); |
22 | 24 | $this->routeRequest( 'admin', $request['action'], $request ); |
23 | 25 | } |
@@ -39,10 +41,16 @@ discard block |
||
39 | 41 | */ |
40 | 42 | public function routePublicPostRequest() |
41 | 43 | { |
42 | - if( is_admin() )return; |
|
44 | + if( is_admin() ) { |
|
45 | + return; |
|
46 | + } |
|
43 | 47 | $request = $this->getRequest(); |
44 | - if( !$this->isValidPostRequest( $request ))return; |
|
45 | - if( !$this->isValidPublicNonce( $request ))return; |
|
48 | + if( !$this->isValidPostRequest( $request )) { |
|
49 | + return; |
|
50 | + } |
|
51 | + if( !$this->isValidPublicNonce( $request )) { |
|
52 | + return; |
|
53 | + } |
|
46 | 54 | $this->routeRequest( 'public', $request['action'], $request ); |
47 | 55 | } |
48 | 56 | |
@@ -51,7 +59,9 @@ discard block |
||
51 | 59 | */ |
52 | 60 | protected function checkAjaxNonce( array $request ) |
53 | 61 | { |
54 | - if( !is_user_logged_in() )return; |
|
62 | + if( !is_user_logged_in() ) { |
|
63 | + return; |
|
64 | + } |
|
55 | 65 | if( !isset( $request['nonce'] )) { |
56 | 66 | $this->sendAjaxError( 'request is missing a nonce', $request ); |
57 | 67 | } |
@@ -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 | } |
@@ -141,10 +141,10 @@ discard block |
||
141 | 141 | glsr_log()->error( $error )->debug( $request ); |
142 | 142 | glsr_log( $_POST ); |
143 | 143 | glsr( Notice::class )->addError( __( 'There was an error (try refreshing the page).', 'site-reviews' ).' <code>'.$error.'</code>' ); |
144 | - wp_send_json_error([ |
|
144 | + wp_send_json_error( [ |
|
145 | 145 | 'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ), |
146 | 146 | 'notices' => glsr( Notice::class )->get(), |
147 | 147 | 'error' => $error, |
148 | - ]); |
|
148 | + ] ); |
|
149 | 149 | } |
150 | 150 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | */ |
17 | 17 | public function callbackRegisterSettings( $input ) |
18 | 18 | { |
19 | - if( !is_array( $input )) { |
|
19 | + if( !is_array( $input ) ) { |
|
20 | 20 | $input = ['settings' => []]; |
21 | 21 | } |
22 | 22 | if( key( $input ) == 'settings' ) { |
@@ -24,7 +24,7 @@ discard block |
||
24 | 24 | $options = $this->sanitizeGeneral( $input, $options ); |
25 | 25 | $options = $this->sanitizeSubmissions( $input, $options ); |
26 | 26 | $options = $this->sanitizeTranslations( $input, $options ); |
27 | - glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' )); |
|
27 | + glsr( Notice::class )->addSuccess( __( 'Settings updated.', 'site-reviews' ) ); |
|
28 | 28 | return $options; |
29 | 29 | } |
30 | 30 | return $input; |
@@ -38,7 +38,7 @@ discard block |
||
38 | 38 | { |
39 | 39 | register_setting( Application::ID.'-settings', OptionManager::databaseKey(), [ |
40 | 40 | 'sanitize_callback' => [$this, 'callbackRegisterSettings'], |
41 | - ]); |
|
41 | + ] ); |
|
42 | 42 | } |
43 | 43 | |
44 | 44 | /** |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | protected function sanitizeGeneral( array $input, array $options ) |
48 | 48 | { |
49 | 49 | $inputForm = $input['settings']['general']; |
50 | - if( !isset( $inputForm['notifications'] )) { |
|
50 | + if( !isset($inputForm['notifications']) ) { |
|
51 | 51 | $options['settings']['general']['notifications'] = []; |
52 | 52 | } |
53 | 53 | if( trim( $inputForm['notification_message'] ) == '' ) { |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | protected function sanitizeSubmissions( array $input, array $options ) |
63 | 63 | { |
64 | 64 | $inputForm = $input['settings']['submissions']; |
65 | - if( !isset( $inputForm['required'] )) { |
|
65 | + if( !isset($inputForm['required']) ) { |
|
66 | 66 | $options['settings']['submissions']['required'] = []; |
67 | 67 | } |
68 | 68 | return $options; |
@@ -73,13 +73,13 @@ discard block |
||
73 | 73 | */ |
74 | 74 | protected function sanitizeTranslations( array $input, array $options ) |
75 | 75 | { |
76 | - if( isset( $input['settings']['strings'] )) { |
|
77 | - $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] )); |
|
76 | + if( isset($input['settings']['strings']) ) { |
|
77 | + $options['settings']['strings'] = array_values( array_filter( $input['settings']['strings'] ) ); |
|
78 | 78 | array_walk( $options['settings']['strings'], function( &$string ) { |
79 | - if( isset( $string['s2'] )) { |
|
79 | + if( isset($string['s2']) ) { |
|
80 | 80 | $string['s2'] = wp_strip_all_tags( $string['s2'] ); |
81 | 81 | } |
82 | - if( isset( $string['p2'] )) { |
|
82 | + if( isset($string['p2']) ) { |
|
83 | 83 | $string['p2'] = wp_strip_all_tags( $string['p2'] ); |
84 | 84 | } |
85 | 85 | }); |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | protected function getFieldDefault( array $field ) |
31 | 31 | { |
32 | - return isset( $field['default'] ) |
|
32 | + return isset($field['default']) |
|
33 | 33 | ? $field['default'] |
34 | 34 | : ''; |
35 | 35 | } |
@@ -40,7 +40,7 @@ discard block |
||
40 | 40 | protected function getSettingFields( $path ) |
41 | 41 | { |
42 | 42 | $settings = glsr( DefaultsManager::class )->settings(); |
43 | - return array_filter( $settings, function( $key ) use( $path ) { |
|
43 | + return array_filter( $settings, function( $key ) use($path) { |
|
44 | 44 | return glsr( Helper::class )->startsWith( $path, $key ); |
45 | 45 | }, ARRAY_FILTER_USE_KEY ); |
46 | 46 | } |
@@ -55,8 +55,8 @@ discard block |
||
55 | 55 | $field = wp_parse_args( $field, [ |
56 | 56 | 'is_setting' => true, |
57 | 57 | 'name' => $name, |
58 | - ]); |
|
59 | - $rows.= new Field( $this->normalize( $field )); |
|
58 | + ] ); |
|
59 | + $rows .= new Field( $this->normalize( $field ) ); |
|
60 | 60 | } |
61 | 61 | return $rows; |
62 | 62 | } |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | */ |
68 | 68 | protected function getTemplateData( $id ) |
69 | 69 | { |
70 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
70 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
71 | 71 | return [ |
72 | 72 | 'context' => [ |
73 | 73 | 'rows' => $this->getSettingRows( $fields ), |
@@ -81,12 +81,12 @@ discard block |
||
81 | 81 | */ |
82 | 82 | protected function getTemplateDataForAddons( $id ) |
83 | 83 | { |
84 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
84 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
85 | 85 | $settings = glsr( Helper::class )->convertDotNotationArray( $fields ); |
86 | 86 | $settingKeys = array_keys( $settings['settings']['addons'] ); |
87 | 87 | $results = []; |
88 | 88 | foreach( $settingKeys as $key ) { |
89 | - $addonFields = array_filter( $fields, function( $path ) use( $key ) { |
|
89 | + $addonFields = array_filter( $fields, function( $path ) use($key) { |
|
90 | 90 | return glsr( Helper::class )->startsWith( 'settings.addons.'.$key, $path ); |
91 | 91 | }, ARRAY_FILTER_USE_KEY ); |
92 | 92 | $results[$key] = $this->getSettingRows( $addonFields ); |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | protected function getTemplateDataForTranslations() |
103 | 103 | { |
104 | 104 | $translations = glsr( Translator::class )->renderAll(); |
105 | - $class = empty( $translations ) |
|
105 | + $class = empty($translations) |
|
106 | 106 | ? 'glsr-hidden' |
107 | 107 | : ''; |
108 | 108 | return [ |
@@ -125,9 +125,9 @@ discard block |
||
125 | 125 | $path, |
126 | 126 | glsr( Helper::class )->getPathValue( $path, glsr()->defaults ) |
127 | 127 | ); |
128 | - if( is_array( $expectedValue )) { |
|
128 | + if( is_array( $expectedValue ) ) { |
|
129 | 129 | return is_array( $optionValue ) |
130 | - ? count( array_intersect( $optionValue, $expectedValue )) === 0 |
|
130 | + ? count( array_intersect( $optionValue, $expectedValue ) ) === 0 |
|
131 | 131 | : !in_array( $optionValue, $expectedValue ); |
132 | 132 | } |
133 | 133 | return $optionValue != $expectedValue; |
@@ -149,17 +149,17 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function normalizeDependsOn( array $field ) |
151 | 151 | { |
152 | - if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) { |
|
152 | + if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) { |
|
153 | 153 | $path = key( $field['depends_on'] ); |
154 | 154 | $expectedValue = $field['depends_on'][$path]; |
155 | 155 | $fieldName = glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ); |
156 | - if( is_array( $expectedValue )) { |
|
157 | - $fieldName.= '[]'; |
|
156 | + if( is_array( $expectedValue ) ) { |
|
157 | + $fieldName .= '[]'; |
|
158 | 158 | } |
159 | - $field['data-depends'] = json_encode([ |
|
159 | + $field['data-depends'] = json_encode( [ |
|
160 | 160 | 'name' => $fieldName, |
161 | 161 | 'value' => $expectedValue, |
162 | - ], JSON_HEX_APOS|JSON_HEX_QUOT ); |
|
162 | + ], JSON_HEX_APOS | JSON_HEX_QUOT ); |
|
163 | 163 | $field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue ); |
164 | 164 | } |
165 | 165 | return $field; |
@@ -170,9 +170,9 @@ discard block |
||
170 | 170 | */ |
171 | 171 | protected function normalizeLabelAndLegend( array $field ) |
172 | 172 | { |
173 | - if( !empty( $field['label'] )) { |
|
173 | + if( !empty($field['label']) ) { |
|
174 | 174 | $field['legend'] = $field['label']; |
175 | - unset( $field['label'] ); |
|
175 | + unset($field['label']); |
|
176 | 176 | } |
177 | 177 | else { |
178 | 178 | $field['is_valid'] = false; |
@@ -186,7 +186,7 @@ discard block |
||
186 | 186 | */ |
187 | 187 | protected function normalizeValue( array $field ) |
188 | 188 | { |
189 | - if( !isset( $field['value'] )) { |
|
189 | + if( !isset($field['value']) ) { |
|
190 | 190 | $field['value'] = glsr( OptionManager::class )->get( |
191 | 191 | $field['name'], |
192 | 192 | $this->getFieldDefault( $field ) |
@@ -41,7 +41,9 @@ |
||
41 | 41 | */ |
42 | 42 | public function send( Review $review ) |
43 | 43 | { |
44 | - if( empty( $this->types ))return; |
|
44 | + if( empty( $this->types )) { |
|
45 | + return; |
|
46 | + } |
|
45 | 47 | $this->review = $review; |
46 | 48 | $args = [ |
47 | 49 | 'link' => $this->getLink(), |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | public function __construct() |
34 | 34 | { |
35 | 35 | $types = glsr( OptionManager::class )->get( 'settings.general.notifications', [] ); |
36 | - $this->email = count( array_intersect( ['admin', 'author', 'custom'], $types )) > 0; |
|
36 | + $this->email = count( array_intersect( ['admin', 'author', 'custom'], $types ) ) > 0; |
|
37 | 37 | $this->slack = in_array( 'slack', $types ); |
38 | 38 | $this->types = $types; |
39 | 39 | } |
@@ -43,7 +43,7 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function send( Review $review ) |
45 | 45 | { |
46 | - if( empty( $this->types ))return; |
|
46 | + if( empty($this->types) )return; |
|
47 | 47 | $this->review = $review; |
48 | 48 | $args = [ |
49 | 49 | 'link' => $this->getLink(), |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | */ |
63 | 63 | protected function buildEmail( array $args ) |
64 | 64 | { |
65 | - return glsr( Email::class )->compose([ |
|
65 | + return glsr( Email::class )->compose( [ |
|
66 | 66 | 'to' => $this->getEmailAddresses(), |
67 | 67 | 'subject' => $args['title'], |
68 | 68 | 'template' => 'email-notification', |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | 'review_rating' => $this->review->rating, |
76 | 76 | 'review_title' => $this->review->title, |
77 | 77 | ], |
78 | - ]); |
|
78 | + ] ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -87,7 +87,7 @@ discard block |
||
87 | 87 | 'button_url' => $args['link'], |
88 | 88 | 'fallback' => $this->buildEmail( $args )->read( 'plaintext' ), |
89 | 89 | 'pretext' => $args['title'], |
90 | - ]); |
|
90 | + ] ); |
|
91 | 91 | } |
92 | 92 | |
93 | 93 | /** |
@@ -96,22 +96,22 @@ discard block |
||
96 | 96 | protected function getEmailAddresses() |
97 | 97 | { |
98 | 98 | $emails = []; |
99 | - if( in_array( 'admin', $this->types )) { |
|
99 | + if( in_array( 'admin', $this->types ) ) { |
|
100 | 100 | $emails[] = get_option( 'admin_email' ); |
101 | 101 | } |
102 | - if( in_array( 'author', $this->types )) { |
|
103 | - $assignedPost = get_post( intval( $this->review->assigned_to )); |
|
102 | + if( in_array( 'author', $this->types ) ) { |
|
103 | + $assignedPost = get_post( intval( $this->review->assigned_to ) ); |
|
104 | 104 | if( $assignedPost instanceof WP_Post ) { |
105 | 105 | $emails[] = get_the_author_meta( 'user_email', $assignedPost->post_author ); |
106 | 106 | } |
107 | 107 | } |
108 | - if( in_array( 'custom', $this->types )) { |
|
108 | + if( in_array( 'custom', $this->types ) ) { |
|
109 | 109 | $customEmails = glsr( OptionManager::class )->get( 'settings.general.notification_email' ); |
110 | 110 | $customEmails = str_replace( [' ', ',', ';'], ',', $customEmails ); |
111 | 111 | $customEmails = explode( ',', $customEmails ); |
112 | 112 | $emails = array_merge( $emails, $customEmails ); |
113 | 113 | } |
114 | - $emails = array_filter( array_keys( array_flip( $emails ))); |
|
114 | + $emails = array_filter( array_keys( array_flip( $emails ) ) ); |
|
115 | 115 | return apply_filters( 'site-reviews/notification/emails', $emails, $this->review ); |
116 | 116 | } |
117 | 117 | |
@@ -128,16 +128,16 @@ discard block |
||
128 | 128 | */ |
129 | 129 | protected function getTitle() |
130 | 130 | { |
131 | - $assignedTitle = get_the_title( intval( $this->review->assigned_to )); |
|
131 | + $assignedTitle = get_the_title( intval( $this->review->assigned_to ) ); |
|
132 | 132 | $title = _nx( |
133 | 133 | 'New %s-star review', |
134 | 134 | 'New %s-star review of: %s', |
135 | - intval( empty( $assignedTitle )), |
|
135 | + intval( empty($assignedTitle) ), |
|
136 | 136 | 'This string differs depending on whether or not the review has been assigned to a post.', |
137 | 137 | 'site-reviews' |
138 | 138 | ); |
139 | 139 | $title = sprintf( '[%s] %s', |
140 | - wp_specialchars_decode( strval( get_option( 'blogname' )), ENT_QUOTES ), |
|
140 | + wp_specialchars_decode( strval( get_option( 'blogname' ) ), ENT_QUOTES ), |
|
141 | 141 | sprintf( $title, $this->review->rating, $assignedTitle ) |
142 | 142 | ); |
143 | 143 | return apply_filters( 'site-reviews/notification/title', $title, $this->review ); |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | protected function sendToEmail( array $args ) |
150 | 150 | { |
151 | 151 | $email = $this->buildEmail( $args ); |
152 | - if( empty( $email->to )) { |
|
152 | + if( empty($email->to) ) { |
|
153 | 153 | glsr_log()->error( 'Email notification was not sent: missing email address' ); |
154 | 154 | return; |
155 | 155 | } |
@@ -165,7 +165,7 @@ discard block |
||
165 | 165 | { |
166 | 166 | $notification = $this->buildSlackNotification( $args ); |
167 | 167 | $result = $notification->send(); |
168 | - if( is_wp_error( $result )) { |
|
168 | + if( is_wp_error( $result ) ) { |
|
169 | 169 | $notification->review = null; |
170 | 170 | glsr_log()->error( $result->get_error_message() )->debug( $notification ); |
171 | 171 | } |
@@ -17,14 +17,14 @@ |
||
17 | 17 | $review = glsr( ReviewManager::class )->create( $command ); |
18 | 18 | if( !$review ) { |
19 | 19 | glsr( Session::class )->set( $command->form_id.'errors', [] ); |
20 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' )); |
|
20 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review could not be submitted and the error has been logged. Please notify the site admin.', 'site-reviews' ) ); |
|
21 | 21 | return; |
22 | 22 | } |
23 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
|
23 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) ); |
|
24 | 24 | glsr( Notification::class )->send( $review ); |
25 | 25 | do_action( 'site-reviews/local/review/submitted', $review ); |
26 | 26 | if( $command->ajax_request )return; |
27 | - if( empty( $command->referer )) { |
|
27 | + if( empty($command->referer) ) { |
|
28 | 28 | glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->info( $command ); |
29 | 29 | $command->referer = home_url(); |
30 | 30 | } |
@@ -23,7 +23,9 @@ |
||
23 | 23 | glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
24 | 24 | glsr( Notification::class )->send( $review ); |
25 | 25 | do_action( 'site-reviews/local/review/submitted', $review ); |
26 | - if( $command->ajax_request )return; |
|
26 | + if( $command->ajax_request ) { |
|
27 | + return; |
|
28 | + } |
|
27 | 29 | if( empty( $command->referer )) { |
28 | 30 | glsr_log()->warning( 'The form referer ($_SERVER[REQUEST_URI]) was empty.' )->info( $command ); |
29 | 31 | $command->referer = home_url(); |