@@ -44,7 +44,7 @@ discard block |
||
44 | 44 | glsr()->version, |
45 | 45 | true |
46 | 46 | ); |
47 | - if( !empty( $this->pointers )) { |
|
47 | + if( !empty($this->pointers) ) { |
|
48 | 48 | wp_enqueue_style( 'wp-pointer' ); |
49 | 49 | wp_enqueue_script( 'wp-pointer' ); |
50 | 50 | } |
@@ -84,7 +84,7 @@ discard block |
||
84 | 84 | $dependencies = apply_filters( 'site-reviews/enqueue/admin/dependencies', [] ); |
85 | 85 | $dependencies = array_merge( $dependencies, [ |
86 | 86 | 'jquery', 'jquery-ui-sortable', 'underscore', 'wp-util', |
87 | - ]); |
|
87 | + ] ); |
|
88 | 88 | return $dependencies; |
89 | 89 | } |
90 | 90 | |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | $generatedPointers = []; |
115 | 115 | foreach( $pointers as $pointer ) { |
116 | 116 | if( $pointer['screen'] != glsr_current_screen()->id )continue; |
117 | - if( in_array( $pointer['id'], $dismissedPointers ))continue; |
|
117 | + if( in_array( $pointer['id'], $dismissedPointers ) )continue; |
|
118 | 118 | $generatedPointers[] = $this->generatePointer( $pointer ); |
119 | 119 | } |
120 | 120 | $this->pointers = $generatedPointers; |
@@ -126,7 +126,7 @@ discard block |
||
126 | 126 | protected function isCurrentScreen() |
127 | 127 | { |
128 | 128 | $screen = glsr_current_screen(); |
129 | - return $screen && ( $screen->post_type == Application::POST_TYPE |
|
129 | + return $screen && ($screen->post_type == Application::POST_TYPE |
|
130 | 130 | || $screen->base == 'post' |
131 | 131 | || $screen->id == 'dashboard' |
132 | 132 | || $screen->id == 'widgets' |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | { |
141 | 141 | $variables = []; |
142 | 142 | foreach( glsr()->mceShortcodes as $tag => $args ) { |
143 | - if( empty( $args['required'] ))continue; |
|
143 | + if( empty($args['required']) )continue; |
|
144 | 144 | $variables[$tag] = $args['required']; |
145 | 145 | } |
146 | 146 | return $variables; |
@@ -36,7 +36,9 @@ discard block |
||
36 | 36 | [], |
37 | 37 | glsr()->version |
38 | 38 | ); |
39 | - if( !$this->isCurrentScreen() )return; |
|
39 | + if( !$this->isCurrentScreen() ) { |
|
40 | + return; |
|
41 | + } |
|
40 | 42 | wp_enqueue_script( |
41 | 43 | Application::ID, |
42 | 44 | glsr()->url( 'assets/scripts/'.Application::ID.'-admin.js' ), |
@@ -113,8 +115,12 @@ discard block |
||
113 | 115 | $dismissedPointers = explode( ',', (string)$dismissedPointers ); |
114 | 116 | $generatedPointers = []; |
115 | 117 | foreach( $pointers as $pointer ) { |
116 | - if( $pointer['screen'] != glsr_current_screen()->id )continue; |
|
117 | - if( in_array( $pointer['id'], $dismissedPointers ))continue; |
|
118 | + if( $pointer['screen'] != glsr_current_screen()->id ) { |
|
119 | + continue; |
|
120 | + } |
|
121 | + if( in_array( $pointer['id'], $dismissedPointers )) { |
|
122 | + continue; |
|
123 | + } |
|
118 | 124 | $generatedPointers[] = $this->generatePointer( $pointer ); |
119 | 125 | } |
120 | 126 | $this->pointers = $generatedPointers; |
@@ -140,7 +146,9 @@ discard block |
||
140 | 146 | { |
141 | 147 | $variables = []; |
142 | 148 | foreach( glsr()->mceShortcodes as $tag => $args ) { |
143 | - if( empty( $args['required'] ))continue; |
|
149 | + if( empty( $args['required'] )) { |
|
150 | + continue; |
|
151 | + } |
|
144 | 152 | $variables[$tag] = $args['required']; |
145 | 153 | } |
146 | 154 | return $variables; |
@@ -2,7 +2,7 @@ discard block |
||
2 | 2 | |
3 | 3 | defined( 'WPINC' ) || die; |
4 | 4 | |
5 | -require_once( ABSPATH.WPINC.'/class-phpass.php' ); |
|
5 | +require_once(ABSPATH.WPINC.'/class-phpass.php'); |
|
6 | 6 | |
7 | 7 | spl_autoload_register( function( $className ) { |
8 | 8 | $namespaces = [ |
@@ -16,8 +16,8 @@ discard block |
||
16 | 16 | foreach( $namespaces as $prefix => $baseDir ) { |
17 | 17 | $len = strlen( $prefix ); |
18 | 18 | if( strncmp( $prefix, $className, $len ) !== 0 )continue; |
19 | - $file = $baseDir.str_replace( '\\', '/', substr( $className, $len )).'.php'; |
|
20 | - if( !file_exists( $file ))continue; |
|
19 | + $file = $baseDir.str_replace( '\\', '/', substr( $className, $len ) ).'.php'; |
|
20 | + if( !file_exists( $file ) )continue; |
|
21 | 21 | require $file; |
22 | 22 | break; |
23 | 23 | } |
@@ -15,9 +15,13 @@ |
||
15 | 15 | ]; |
16 | 16 | foreach( $namespaces as $prefix => $baseDir ) { |
17 | 17 | $len = strlen( $prefix ); |
18 | - if( strncmp( $prefix, $className, $len ) !== 0 )continue; |
|
18 | + if( strncmp( $prefix, $className, $len ) !== 0 ) { |
|
19 | + continue; |
|
20 | + } |
|
19 | 21 | $file = $baseDir.str_replace( '\\', '/', substr( $className, $len )).'.php'; |
20 | - if( !file_exists( $file ))continue; |
|
22 | + if( !file_exists( $file )) { |
|
23 | + continue; |
|
24 | + } |
|
21 | 25 | require $file; |
22 | 26 | break; |
23 | 27 | } |
@@ -50,7 +50,7 @@ |
||
50 | 50 | public function routerSubmitReview( array $request ) |
51 | 51 | { |
52 | 52 | $validated = glsr( ValidateReview::class )->validate( $request ); |
53 | - if( !empty( $validated->error ) || $validated->recaptchaIsUnset )return; |
|
54 | - $this->execute( new CreateReview( $validated->request )); |
|
53 | + if( !empty($validated->error) || $validated->recaptchaIsUnset )return; |
|
54 | + $this->execute( new CreateReview( $validated->request ) ); |
|
55 | 55 | } |
56 | 56 | } |
@@ -50,7 +50,9 @@ |
||
50 | 50 | public function routerSubmitReview( array $request ) |
51 | 51 | { |
52 | 52 | $validated = glsr( ValidateReview::class )->validate( $request ); |
53 | - if( !empty( $validated->error ) || $validated->recaptchaIsUnset )return; |
|
53 | + if( !empty( $validated->error ) || $validated->recaptchaIsUnset ) { |
|
54 | + return; |
|
55 | + } |
|
54 | 56 | $this->execute( new CreateReview( $validated->request )); |
55 | 57 | } |
56 | 58 | } |
@@ -152,7 +152,9 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function normalizeFieldErrors( Field &$field ) |
154 | 154 | { |
155 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
155 | + if( !array_key_exists( $field->field['path'], $this->errors )) { |
|
156 | + return; |
|
157 | + } |
|
156 | 158 | $field->field['errors'] = $this->errors[$field->field['path']]; |
157 | 159 | } |
158 | 160 | |
@@ -161,7 +163,9 @@ discard block |
||
161 | 163 | */ |
162 | 164 | protected function normalizeFieldRequired( Field &$field ) |
163 | 165 | { |
164 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
166 | + if( !in_array( $field->field['path'], $this->required )) { |
|
167 | + return; |
|
168 | + } |
|
165 | 169 | $field->field['required'] = true; |
166 | 170 | } |
167 | 171 | |
@@ -183,7 +187,9 @@ discard block |
||
183 | 187 | */ |
184 | 188 | protected function normalizeFieldValue( Field &$field ) |
185 | 189 | { |
186 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
190 | + if( !array_key_exists( $field->field['path'], $this->values )) { |
|
191 | + return; |
|
192 | + } |
|
187 | 193 | if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
188 | 194 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
189 | 195 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'response' => $this->buildResponse(), |
62 | 62 | 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(), |
63 | 63 | ], |
64 | - ]); |
|
64 | + ] ); |
|
65 | 65 | } |
66 | 66 | |
67 | 67 | /** |
@@ -71,7 +71,7 @@ discard block |
||
71 | 71 | { |
72 | 72 | $integration = glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ); |
73 | 73 | $recaptchaMethod = glsr( Helper::class )->buildMethodName( $integration, 'getRecaptcha' ); |
74 | - if( method_exists( $this, $recaptchaMethod )) { |
|
74 | + if( method_exists( $this, $recaptchaMethod ) ) { |
|
75 | 75 | return $this->$recaptchaMethod(); |
76 | 76 | } |
77 | 77 | } |
@@ -81,7 +81,7 @@ discard block |
||
81 | 81 | */ |
82 | 82 | protected function buildResponse() |
83 | 83 | { |
84 | - $classes = !empty( $this->errors ) |
|
84 | + $classes = !empty($this->errors) |
|
85 | 85 | ? 'glsr-has-errors' |
86 | 86 | : ''; |
87 | 87 | return glsr( Template::class )->build( 'templates/form/response', [ |
@@ -89,8 +89,8 @@ discard block |
||
89 | 89 | 'class' => $classes, |
90 | 90 | 'message' => wpautop( $this->message ), |
91 | 91 | ], |
92 | - 'has_errors' => !empty( $this->errors ), |
|
93 | - ]); |
|
92 | + 'has_errors' => !empty($this->errors), |
|
93 | + ] ); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | 'context' => [ |
103 | 103 | 'text' => __( 'Submit your review', 'site-reviews' ), |
104 | 104 | ], |
105 | - ]); |
|
105 | + ] ); |
|
106 | 106 | } |
107 | 107 | |
108 | 108 | /** |
@@ -121,7 +121,7 @@ discard block |
||
121 | 121 | $fields = array_merge( |
122 | 122 | $this->getHiddenFields(), |
123 | 123 | [$this->getHoneypotField()], |
124 | - $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )) |
|
124 | + $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ) |
|
125 | 125 | ); |
126 | 126 | return $fields; |
127 | 127 | } |
@@ -134,27 +134,27 @@ discard block |
||
134 | 134 | $fields = [[ |
135 | 135 | 'name' => 'action', |
136 | 136 | 'value' => 'submit-review', |
137 | - ],[ |
|
137 | + ], [ |
|
138 | 138 | 'name' => 'assign_to', |
139 | 139 | 'value' => $this->args['assign_to'], |
140 | - ],[ |
|
140 | + ], [ |
|
141 | 141 | 'name' => 'category', |
142 | 142 | 'value' => $this->args['category'], |
143 | - ],[ |
|
143 | + ], [ |
|
144 | 144 | 'name' => 'excluded', |
145 | 145 | 'value' => $this->args['excluded'], // @todo should default to "[]" |
146 | - ],[ |
|
146 | + ], [ |
|
147 | 147 | 'name' => 'form_id', |
148 | 148 | 'value' => $this->args['id'], |
149 | - ],[ |
|
149 | + ], [ |
|
150 | 150 | 'name' => 'nonce', |
151 | 151 | 'value' => wp_create_nonce( 'submit-review' ), |
152 | - ],[ |
|
152 | + ], [ |
|
153 | 153 | 'name' => 'referer', |
154 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), |
|
154 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), |
|
155 | 155 | ]]; |
156 | 156 | return array_map( function( $field ) { |
157 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
157 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
158 | 158 | }, $fields ); |
159 | 159 | } |
160 | 160 | |
@@ -163,10 +163,10 @@ discard block |
||
163 | 163 | */ |
164 | 164 | protected function getHoneypotField() |
165 | 165 | { |
166 | - return new Field([ |
|
166 | + return new Field( [ |
|
167 | 167 | 'name' => 'gotcha', |
168 | 168 | 'type' => 'honeypot', |
169 | - ]); |
|
169 | + ] ); |
|
170 | 170 | } |
171 | 171 | |
172 | 172 | /** |
@@ -174,12 +174,12 @@ discard block |
||
174 | 174 | */ |
175 | 175 | protected function getRecaptchaCustom() |
176 | 176 | { |
177 | - return glsr( Builder::class )->div([ |
|
177 | + return glsr( Builder::class )->div( [ |
|
178 | 178 | 'class' => 'glsr-recaptcha-holder', |
179 | - 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' )), |
|
180 | - 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )), |
|
179 | + 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ) ), |
|
180 | + 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ), |
|
181 | 181 | 'data-size' => 'invisible', |
182 | - ]); |
|
182 | + ] ); |
|
183 | 183 | } |
184 | 184 | |
185 | 185 | /** |
@@ -192,7 +192,7 @@ discard block |
||
192 | 192 | $html = ob_get_clean(); |
193 | 193 | return glsr( Builder::class )->div( $html, [ |
194 | 194 | 'class' => 'glsr-recaptcha-holder', |
195 | - ]); |
|
195 | + ] ); |
|
196 | 196 | } |
197 | 197 | |
198 | 198 | /** |
@@ -200,7 +200,7 @@ discard block |
||
200 | 200 | */ |
201 | 201 | protected function normalizeFieldErrors( Field &$field ) |
202 | 202 | { |
203 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
203 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
204 | 204 | $field->field['errors'] = $this->errors[$field->field['path']]; |
205 | 205 | } |
206 | 206 | |
@@ -209,7 +209,7 @@ discard block |
||
209 | 209 | */ |
210 | 210 | protected function normalizeFieldRequired( Field &$field ) |
211 | 211 | { |
212 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
212 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
213 | 213 | $field->field['required'] = true; |
214 | 214 | } |
215 | 215 | |
@@ -232,8 +232,8 @@ discard block |
||
232 | 232 | */ |
233 | 233 | protected function normalizeFieldValue( Field &$field ) |
234 | 234 | { |
235 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
236 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
235 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
236 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
237 | 237 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
238 | 238 | } |
239 | 239 | else { |
@@ -43,7 +43,9 @@ discard block |
||
43 | 43 | */ |
44 | 44 | public function build() |
45 | 45 | { |
46 | - if( !$this->field['is_valid'] )return; |
|
46 | + if( !$this->field['is_valid'] ) { |
|
47 | + return; |
|
48 | + } |
|
47 | 49 | if( $this->field['is_raw'] ) { |
48 | 50 | return glsr( Builder::class )->{$this->field['type']}( $this->field ); |
49 | 51 | } |
@@ -143,7 +145,9 @@ discard block |
||
143 | 145 | */ |
144 | 146 | protected function getFieldErrors() |
145 | 147 | { |
146 | - if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return; |
|
148 | + if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] )) { |
|
149 | + return; |
|
150 | + } |
|
147 | 151 | $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
148 | 152 | return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
149 | 153 | }); |
@@ -170,7 +174,9 @@ discard block |
||
170 | 174 | 'name', 'type', |
171 | 175 | ]; |
172 | 176 | foreach( $requiredValues as $value ) { |
173 | - if( isset( $this->field[$value] ))continue; |
|
177 | + if( isset( $this->field[$value] )) { |
|
178 | + continue; |
|
179 | + } |
|
174 | 180 | $missingValues[] = $value; |
175 | 181 | $this->field['is_valid'] = false; |
176 | 182 | } |
@@ -187,7 +193,9 @@ discard block |
||
187 | 193 | */ |
188 | 194 | protected function normalize() |
189 | 195 | { |
190 | - if( !$this->isFieldValid() )return; |
|
196 | + if( !$this->isFieldValid() ) { |
|
197 | + return; |
|
198 | + } |
|
191 | 199 | $this->field['path'] = $this->field['name']; |
192 | 200 | $className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
193 | 201 | if( class_exists( $className )) { |
@@ -205,7 +213,9 @@ discard block |
||
205 | 213 | */ |
206 | 214 | protected function normalizeFieldId() |
207 | 215 | { |
208 | - if( isset( $this->field['id'] ) || $this->field['is_raw'] )return; |
|
216 | + if( isset( $this->field['id'] ) || $this->field['is_raw'] ) { |
|
217 | + return; |
|
218 | + } |
|
209 | 219 | $this->field['id'] = glsr( Helper::class )->convertPathToId( |
210 | 220 | $this->field['path'], |
211 | 221 | $this->getFieldPrefix() |
@@ -27,7 +27,7 @@ discard block |
||
27 | 27 | 'is_valid' => true, |
28 | 28 | 'is_widget' => false, |
29 | 29 | 'path' => '', |
30 | - ]); |
|
30 | + ] ); |
|
31 | 31 | $this->normalize(); |
32 | 32 | } |
33 | 33 | |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | { |
47 | 47 | if( !$this->field['is_valid'] )return; |
48 | 48 | if( $this->field['is_raw'] ) { |
49 | - return glsr( Builder::class )->{$this->field['type']}( $this->field ); |
|
49 | + return glsr( Builder::class )->{$this->field['type']}($this->field); |
|
50 | 50 | } |
51 | 51 | if( !$this->field['is_setting'] ) { |
52 | 52 | return $this->buildField(); |
@@ -75,15 +75,15 @@ discard block |
||
75 | 75 | 'class' => $this->getFieldClass(), |
76 | 76 | 'errors' => $this->getFieldErrors(), |
77 | 77 | 'field' => glsr( Builder::class )->raw( $this->field ), |
78 | - 'label' => glsr( Builder::class )->label([ |
|
78 | + 'label' => glsr( Builder::class )->label( [ |
|
79 | 79 | 'class' => 'glsr-'.$this->field['type'].'-label', |
80 | 80 | 'for' => $this->field['id'], |
81 | 81 | 'is_public' => $this->field['is_public'], |
82 | 82 | 'text' => $this->field['label'].'<span></span>', |
83 | 83 | 'type' => $this->field['type'], |
84 | - ]), |
|
84 | + ] ), |
|
85 | 85 | ], |
86 | - ]); |
|
86 | + ] ); |
|
87 | 87 | return apply_filters( 'site-reviews/rendered/field', $field, $this->field['type'], $this->field ); |
88 | 88 | } |
89 | 89 | |
@@ -95,10 +95,10 @@ discard block |
||
95 | 95 | return glsr( Template::class )->build( 'partials/form/table-row', [ |
96 | 96 | 'context' => [ |
97 | 97 | 'class' => $this->getFieldClass(), |
98 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
98 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
99 | 99 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
100 | 100 | ], |
101 | - ]); |
|
101 | + ] ); |
|
102 | 102 | } |
103 | 103 | |
104 | 104 | /** |
@@ -107,16 +107,16 @@ discard block |
||
107 | 107 | protected function buildSettingMultiField() |
108 | 108 | { |
109 | 109 | $dependsOn = $this->getFieldDependsOn(); |
110 | - unset( $this->field['data-depends'] ); |
|
110 | + unset($this->field['data-depends']); |
|
111 | 111 | return glsr( Template::class )->build( 'partials/form/table-row-multiple', [ |
112 | 112 | 'context' => [ |
113 | 113 | 'class' => $this->getFieldClass(), |
114 | 114 | 'depends_on' => $dependsOn, |
115 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
115 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
116 | 116 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
117 | 117 | 'legend' => $this->field['legend'], |
118 | 118 | ], |
119 | - ]); |
|
119 | + ] ); |
|
120 | 120 | } |
121 | 121 | |
122 | 122 | /** |
@@ -125,13 +125,13 @@ discard block |
||
125 | 125 | protected function getFieldClass() |
126 | 126 | { |
127 | 127 | $classes = []; |
128 | - if( !empty( $this->field['errors'] )) { |
|
128 | + if( !empty($this->field['errors']) ) { |
|
129 | 129 | $classes[] = 'glsr-has-error'; |
130 | 130 | } |
131 | 131 | if( $this->field['is_hidden'] ) { |
132 | 132 | $classes[] = 'hidden'; |
133 | 133 | } |
134 | - if( !empty( $this->field['required'] )) { |
|
134 | + if( !empty($this->field['required']) ) { |
|
135 | 135 | $classes[] = 'glsr-required'; |
136 | 136 | } |
137 | 137 | return implode( ' ', $classes ); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | */ |
143 | 143 | protected function getFieldDependsOn() |
144 | 144 | { |
145 | - return !empty( $this->field['data-depends'] ) |
|
145 | + return !empty($this->field['data-depends']) |
|
146 | 146 | ? $this->field['data-depends'] |
147 | 147 | : ''; |
148 | 148 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function getFieldErrors() |
154 | 154 | { |
155 | - if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return; |
|
155 | + if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) )return; |
|
156 | 156 | $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
157 | 157 | return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
158 | 158 | }); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | 'context' => [ |
161 | 161 | 'errors' => $errors, |
162 | 162 | ], |
163 | - ]); |
|
163 | + ] ); |
|
164 | 164 | } |
165 | 165 | |
166 | 166 | /** |
@@ -183,13 +183,13 @@ discard block |
||
183 | 183 | 'name', 'type', |
184 | 184 | ]; |
185 | 185 | foreach( $requiredValues as $value ) { |
186 | - if( isset( $this->field[$value] ))continue; |
|
186 | + if( isset($this->field[$value]) )continue; |
|
187 | 187 | $missingValues[] = $value; |
188 | 188 | $this->field['is_valid'] = false; |
189 | 189 | } |
190 | - if( !empty( $missingValues )) { |
|
190 | + if( !empty($missingValues) ) { |
|
191 | 191 | glsr_log() |
192 | - ->warning( 'Field is missing: '.implode( ', ', $missingValues )) |
|
192 | + ->warning( 'Field is missing: '.implode( ', ', $missingValues ) ) |
|
193 | 193 | ->info( $this->field ); |
194 | 194 | } |
195 | 195 | return $this->field['is_valid']; |
@@ -203,7 +203,7 @@ discard block |
||
203 | 203 | if( !$this->isFieldValid() )return; |
204 | 204 | $this->field['path'] = $this->field['name']; |
205 | 205 | $className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
206 | - if( class_exists( $className )) { |
|
206 | + if( class_exists( $className ) ) { |
|
207 | 207 | $this->field = array_merge( |
208 | 208 | wp_parse_args( $this->field, $className::defaults() ), |
209 | 209 | $className::required() |
@@ -218,7 +218,7 @@ discard block |
||
218 | 218 | */ |
219 | 219 | protected function normalizeFieldId() |
220 | 220 | { |
221 | - if( isset( $this->field['id'] ) || $this->field['is_raw'] )return; |
|
221 | + if( isset($this->field['id']) || $this->field['is_raw'] )return; |
|
222 | 222 | $this->field['id'] = glsr( Helper::class )->convertPathToId( |
223 | 223 | $this->field['path'], |
224 | 224 | $this->getFieldPrefix() |
@@ -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->referrer = $this->get( 'referrer' ); |
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 | } |
@@ -193,8 +193,12 @@ discard block |
||
193 | 193 | */ |
194 | 194 | protected function validateAkismet() |
195 | 195 | { |
196 | - if( !empty( $this->error ))return; |
|
197 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
196 | + if( !empty( $this->error )) { |
|
197 | + return; |
|
198 | + } |
|
199 | + if( !glsr( Akismet::class )->isSpam( $this->request )) { |
|
200 | + return; |
|
201 | + } |
|
198 | 202 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
199 | 203 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
200 | 204 | } |
@@ -204,8 +208,12 @@ discard block |
||
204 | 208 | */ |
205 | 209 | protected function validateBlacklist() |
206 | 210 | { |
207 | - if( !empty( $this->error ))return; |
|
208 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
211 | + if( !empty( $this->error )) { |
|
212 | + return; |
|
213 | + } |
|
214 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) { |
|
215 | + return; |
|
216 | + } |
|
209 | 217 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
210 | 218 | if( $blacklistAction == 'reject' ) { |
211 | 219 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -220,9 +228,13 @@ discard block |
||
220 | 228 | */ |
221 | 229 | protected function validateCustom() |
222 | 230 | { |
223 | - if( !empty( $this->error ))return; |
|
231 | + if( !empty( $this->error )) { |
|
232 | + return; |
|
233 | + } |
|
224 | 234 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
225 | - if( $validated === true )return; |
|
235 | + if( $validated === true ) { |
|
236 | + return; |
|
237 | + } |
|
226 | 238 | $this->setSessionValues( 'errors', [] ); |
227 | 239 | $this->setSessionValues( 'values', $this->request ); |
228 | 240 | $this->error = is_string( $validated ) |
@@ -235,8 +247,12 @@ discard block |
||
235 | 247 | */ |
236 | 248 | protected function validateHoneyPot() |
237 | 249 | { |
238 | - if( !empty( $this->error ))return; |
|
239 | - if( empty( $this->request['gotcha'] ))return; |
|
250 | + if( !empty( $this->error )) { |
|
251 | + return; |
|
252 | + } |
|
253 | + if( empty( $this->request['gotcha'] )) { |
|
254 | + return; |
|
255 | + } |
|
240 | 256 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
241 | 257 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
242 | 258 | } |
@@ -246,7 +262,9 @@ discard block |
||
246 | 262 | */ |
247 | 263 | protected function validateRecaptcha() |
248 | 264 | { |
249 | - if( !empty( $this->error ))return; |
|
265 | + if( !empty( $this->error )) { |
|
266 | + return; |
|
267 | + } |
|
250 | 268 | $isValid = $this->isRecaptchaResponseValid(); |
251 | 269 | if( is_null( $isValid )) { |
252 | 270 | $this->setSessionValues( 'recaptcha', true ); |
@@ -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; |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
87 | 87 | $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 | /** |
@@ -101,14 +101,14 @@ discard block |
||
101 | 101 | if( !$integration ) { |
102 | 102 | return true; |
103 | 103 | } |
104 | - if( empty( $this->request['recaptcha-token'] )) { |
|
104 | + if( empty($this->request['recaptcha-token']) ) { |
|
105 | 105 | return null; // @see $this->validateRecaptcha() |
106 | 106 | } |
107 | 107 | if( $integration == 'custom' ) { |
108 | 108 | return $this->isRecaptchaValid( $this->request['recaptcha-token'] ); |
109 | 109 | } |
110 | 110 | if( $integration == 'invisible-recaptcha' ) { |
111 | - return boolval( apply_filters( 'google_invre_is_valid_request_filter', true )); |
|
111 | + return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) ); |
|
112 | 112 | } |
113 | 113 | return false; |
114 | 114 | } |
@@ -119,17 +119,17 @@ discard block |
||
119 | 119 | */ |
120 | 120 | protected function isRecaptchaValid( $recaptchaToken ) |
121 | 121 | { |
122 | - $endpoint = add_query_arg([ |
|
122 | + $endpoint = add_query_arg( [ |
|
123 | 123 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
124 | 124 | 'response' => $recaptchaToken, |
125 | 125 | 'secret' => $this->getOption( 'settings.submissions.recaptcha.secret' ), |
126 | 126 | ], static::RECAPTCHA_ENDPOINT ); |
127 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
127 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
128 | 128 | glsr_log()->error( $response->get_error_message() ); |
129 | 129 | return false; |
130 | 130 | } |
131 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
132 | - if( !empty( $response->success )) { |
|
131 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
132 | + if( !empty($response->success) ) { |
|
133 | 133 | return boolval( $response->success ); |
134 | 134 | } |
135 | 135 | $errorCodes = [ |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | { |
153 | 153 | $rules = $this->getValidationRules( $request ); |
154 | 154 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
155 | - if( empty( $errors )) { |
|
155 | + if( empty($errors) ) { |
|
156 | 156 | return true; |
157 | 157 | } |
158 | 158 | $this->setSessionValues( 'errors', $errors ); |
@@ -169,7 +169,7 @@ discard block |
||
169 | 169 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
170 | 170 | { |
171 | 171 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
172 | - if( !empty( $loggedMessage )) { |
|
172 | + if( !empty($loggedMessage) ) { |
|
173 | 173 | glsr_log()->warning( $loggedMessage ); |
174 | 174 | glsr_log()->warning( $this->request ); |
175 | 175 | } |
@@ -180,8 +180,8 @@ discard block |
||
180 | 180 | */ |
181 | 181 | protected function validateAkismet() |
182 | 182 | { |
183 | - if( !empty( $this->error ))return; |
|
184 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
183 | + if( !empty($this->error) )return; |
|
184 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
185 | 185 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
186 | 186 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
187 | 187 | } |
@@ -191,8 +191,8 @@ discard block |
||
191 | 191 | */ |
192 | 192 | protected function validateBlacklist() |
193 | 193 | { |
194 | - if( !empty( $this->error ))return; |
|
195 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
194 | + if( !empty($this->error) )return; |
|
195 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
196 | 196 | $blacklistAction = $this->getOption( 'settings.submissions.blacklist.action' ); |
197 | 197 | if( $blacklistAction == 'reject' ) { |
198 | 198 | $this->setSessionValues( 'errors', [], 'Blacklisted submission detected:' ); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | protected function validateCustom() |
209 | 209 | { |
210 | - if( !empty( $this->error ))return; |
|
210 | + if( !empty($this->error) )return; |
|
211 | 211 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
212 | 212 | if( $validated === true )return; |
213 | 213 | $this->setSessionValues( 'errors', [] ); |
@@ -222,8 +222,8 @@ discard block |
||
222 | 222 | */ |
223 | 223 | protected function validateHoneyPot() |
224 | 224 | { |
225 | - if( !empty( $this->error ))return; |
|
226 | - if( empty( $this->request['gotcha'] ))return; |
|
225 | + if( !empty($this->error) )return; |
|
226 | + if( empty($this->request['gotcha']) )return; |
|
227 | 227 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
228 | 228 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
229 | 229 | } |
@@ -233,9 +233,9 @@ discard block |
||
233 | 233 | */ |
234 | 234 | protected function validateRecaptcha() |
235 | 235 | { |
236 | - if( !empty( $this->error ))return; |
|
236 | + if( !empty($this->error) )return; |
|
237 | 237 | $isValid = $this->isRecaptchaResponseValid(); |
238 | - if( is_null( $isValid )) { |
|
238 | + if( is_null( $isValid ) ) { |
|
239 | 239 | $this->setSessionValues( 'recaptcha', true ); |
240 | 240 | $this->recaptchaIsUnset = true; |
241 | 241 | } |
@@ -251,11 +251,11 @@ discard block |
||
251 | 251 | */ |
252 | 252 | protected function validateRequest( array $request ) |
253 | 253 | { |
254 | - if( !$this->isRequestValid( $request )) { |
|
254 | + if( !$this->isRequestValid( $request ) ) { |
|
255 | 255 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
256 | 256 | return $request; |
257 | 257 | } |
258 | - if( empty( $request['title'] )) { |
|
258 | + if( empty($request['title']) ) { |
|
259 | 259 | $request['title'] = __( 'No Title', 'site-reviews' ); |
260 | 260 | } |
261 | 261 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -16,11 +16,11 @@ discard block |
||
16 | 16 | <div id="<?= $tax_name; ?>-all" class="tabs-panel"> |
17 | 17 | <input type="hidden" name="tax_input[<?= $tax_name; ?>][]" value='0' /> |
18 | 18 | <ul id="<?= $tax_name; ?>checklist" data-wp-lists="list:<?= $tax_name; ?>" class="categorychecklist form-no-clear"> |
19 | - <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids )); ?> |
|
19 | + <?php wp_terms_checklist( $post->ID, array( 'taxonomy' => $tax_name, 'popular_cats' => $popular_ids ) ); ?> |
|
20 | 20 | </ul> |
21 | 21 | </div> |
22 | 22 | |
23 | - <?php if( current_user_can( $taxonomy->cap->edit_terms )) : ?> |
|
23 | + <?php if( current_user_can( $taxonomy->cap->edit_terms ) ) : ?> |
|
24 | 24 | <div id="<?= $tax_name; ?>-adder" class="wp-hidden-children"> |
25 | 25 | <a id="<?= $tax_name; ?>-add-toggle" href="#<?= $tax_name; ?>-add" class="hide-if-no-js taxonomy-add-new"> |
26 | 26 | <?= sprintf( '+ %s', $taxonomy->labels->add_new_item ); ?> |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | <label class="screen-reader-text" for="new<?= $tax_name; ?>"><?= $taxonomy->labels->add_new_item; ?></label> |
30 | 30 | <input type="text" name="new<?= $tax_name; ?>" id="new<?= $tax_name; ?>" class="form-required form-input-tip" value="<?= esc_attr( $taxonomy->labels->new_item_name ); ?>" aria-required="true"/> |
31 | 31 | <input type="button" id="<?= $tax_name; ?>-add-submit" data-wp-lists="add:<?= $tax_name; ?>checklist:<?= $tax_name; ?>-add" class="button category-add-submit" value="<?= esc_attr( $taxonomy->labels->add_new_item ); ?>" /> |
32 | - <?php wp_nonce_field( 'add-' . $tax_name, '_ajax_nonce-add-' . $tax_name, false ); ?> |
|
32 | + <?php wp_nonce_field( 'add-'.$tax_name, '_ajax_nonce-add-'.$tax_name, false ); ?> |
|
33 | 33 | <span id="<?= $tax_name; ?>-ajax-response"></span> |
34 | 34 | </div> |
35 | 35 | </div> |
@@ -1,7 +1,7 @@ |
||
1 | 1 | <?php defined( 'WPINC' ) || die; ?> |
2 | 2 | |
3 | 3 | <div id="titlediv"> |
4 | - <input type="text" id="title" value="<?= $post->post_title ? esc_attr( $post->post_title ) : sprintf( '(%s)', __( 'no title', 'site-reviews' )); ?>" readonly> |
|
4 | + <input type="text" id="title" value="<?= $post->post_title ? esc_attr( $post->post_title ) : sprintf( '(%s)', __( 'no title', 'site-reviews' ) ); ?>" readonly> |
|
5 | 5 | </div> |
6 | 6 | |
7 | 7 | <div id="contentdiv"> |