@@ -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 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | 'submit_button' => $this->buildSubmitButton().$this->buildRecaptcha(), |
58 | 58 | ], |
59 | 59 | 'fields' => $this->getFields(), |
60 | - ]); |
|
60 | + ] ); |
|
61 | 61 | } |
62 | 62 | |
63 | 63 | /** |
@@ -67,7 +67,7 @@ discard block |
||
67 | 67 | { |
68 | 68 | $integration = glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.integration' ); |
69 | 69 | $recaptchaMethod = glsr( Helper::class )->buildMethodName( $integration, 'getRecaptcha' ); |
70 | - if( method_exists( $this, $recaptchaMethod )) { |
|
70 | + if( method_exists( $this, $recaptchaMethod ) ) { |
|
71 | 71 | return $this->$recaptchaMethod(); |
72 | 72 | } |
73 | 73 | } |
@@ -80,7 +80,7 @@ discard block |
||
80 | 80 | return glsr( Partial::class )->build( 'form-results', [ |
81 | 81 | 'errors' => $this->errors, |
82 | 82 | 'message' => $this->message, |
83 | - ]); |
|
83 | + ] ); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -90,7 +90,7 @@ discard block |
||
90 | 90 | { |
91 | 91 | return glsr( Builder::class )->button( '<span></span>'.__( 'Submit your review', 'site-reviews' ), [ |
92 | 92 | 'type' => 'submit', |
93 | - ]); |
|
93 | + ] ); |
|
94 | 94 | } |
95 | 95 | |
96 | 96 | /** |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $fields = array_merge( |
111 | 111 | $this->getHiddenFields(), |
112 | 112 | [$this->getHoneypotField()], |
113 | - $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' )) |
|
113 | + $this->normalizeFields( glsr( Form::class )->getFields( 'submission-form' ) ) |
|
114 | 114 | ); |
115 | 115 | return $fields; |
116 | 116 | } |
@@ -123,27 +123,27 @@ discard block |
||
123 | 123 | $fields = [[ |
124 | 124 | 'name' => 'action', |
125 | 125 | 'value' => 'submit-review', |
126 | - ],[ |
|
126 | + ], [ |
|
127 | 127 | 'name' => 'assign_to', |
128 | 128 | 'value' => $this->args['assign_to'], |
129 | - ],[ |
|
129 | + ], [ |
|
130 | 130 | 'name' => 'category', |
131 | 131 | 'value' => $this->args['category'], |
132 | - ],[ |
|
132 | + ], [ |
|
133 | 133 | 'name' => 'excluded', |
134 | 134 | 'value' => $this->args['excluded'], // @todo should default to "[]" |
135 | - ],[ |
|
135 | + ], [ |
|
136 | 136 | 'name' => 'form_id', |
137 | 137 | 'value' => $this->args['id'], |
138 | - ],[ |
|
138 | + ], [ |
|
139 | 139 | 'name' => 'nonce', |
140 | 140 | 'value' => wp_create_nonce( 'submit-review' ), |
141 | - ],[ |
|
141 | + ], [ |
|
142 | 142 | 'name' => 'referer', |
143 | - 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' )), |
|
143 | + 'value' => wp_unslash( filter_input( INPUT_SERVER, 'REQUEST_URI' ) ), |
|
144 | 144 | ]]; |
145 | 145 | return array_map( function( $field ) { |
146 | - return new Field( wp_parse_args( $field, ['type' => 'hidden'] )); |
|
146 | + return new Field( wp_parse_args( $field, ['type' => 'hidden'] ) ); |
|
147 | 147 | }, $fields ); |
148 | 148 | } |
149 | 149 | |
@@ -152,10 +152,10 @@ discard block |
||
152 | 152 | */ |
153 | 153 | protected function getHoneypotField() |
154 | 154 | { |
155 | - return new Field([ |
|
155 | + return new Field( [ |
|
156 | 156 | 'name' => 'gotcha', |
157 | 157 | 'type' => 'honeypot', |
158 | - ]); |
|
158 | + ] ); |
|
159 | 159 | } |
160 | 160 | |
161 | 161 | /** |
@@ -163,12 +163,12 @@ discard block |
||
163 | 163 | */ |
164 | 164 | protected function getRecaptchaCustom() |
165 | 165 | { |
166 | - return glsr( Builder::class )->div([ |
|
166 | + return glsr( Builder::class )->div( [ |
|
167 | 167 | 'class' => 'glsr-recaptcha-holder', |
168 | - 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' )), |
|
169 | - 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' )), |
|
168 | + 'data-badge' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.position' ) ), |
|
169 | + 'data-sitekey' => sanitize_text_field( glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.key' ) ), |
|
170 | 170 | 'data-size' => 'invisible', |
171 | - ]); |
|
171 | + ] ); |
|
172 | 172 | } |
173 | 173 | |
174 | 174 | /** |
@@ -181,7 +181,7 @@ discard block |
||
181 | 181 | $html = ob_get_clean(); |
182 | 182 | return glsr( Builder::class )->div( $html, [ |
183 | 183 | 'class' => 'glsr-recaptcha-holder', |
184 | - ]); |
|
184 | + ] ); |
|
185 | 185 | } |
186 | 186 | |
187 | 187 | /** |
@@ -189,7 +189,7 @@ discard block |
||
189 | 189 | */ |
190 | 190 | protected function normalizeFieldErrors( Field &$field ) |
191 | 191 | { |
192 | - if( !array_key_exists( $field->field['path'], $this->errors ))return; |
|
192 | + if( !array_key_exists( $field->field['path'], $this->errors ) )return; |
|
193 | 193 | $field->field['errors'] = $this->errors[$field->field['path']]; |
194 | 194 | } |
195 | 195 | |
@@ -198,7 +198,7 @@ discard block |
||
198 | 198 | */ |
199 | 199 | protected function normalizeFieldRequired( Field &$field ) |
200 | 200 | { |
201 | - if( !in_array( $field->field['path'], $this->required ))return; |
|
201 | + if( !in_array( $field->field['path'], $this->required ) )return; |
|
202 | 202 | $field->field['required'] = true; |
203 | 203 | } |
204 | 204 | |
@@ -220,8 +220,8 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function normalizeFieldValue( Field &$field ) |
222 | 222 | { |
223 | - if( !array_key_exists( $field->field['path'], $this->values ))return; |
|
224 | - if( in_array( $field->field['type'], ['radio', 'checkbox'] )) { |
|
223 | + if( !array_key_exists( $field->field['path'], $this->values ) )return; |
|
224 | + if( in_array( $field->field['type'], ['radio', 'checkbox'] ) ) { |
|
225 | 225 | $field->field['checked'] = $field->field['value'] == $this->values[$field->field['path']]; |
226 | 226 | } |
227 | 227 | else { |
@@ -23,7 +23,7 @@ discard block |
||
23 | 23 | : $this->$method( $id ); |
24 | 24 | return glsr( Template::class )->build( 'pages/settings/'.$id, [ |
25 | 25 | 'context' => $context, |
26 | - ]); |
|
26 | + ] ); |
|
27 | 27 | } |
28 | 28 | |
29 | 29 | /** |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | */ |
32 | 32 | protected function getFieldDefault( array $field ) |
33 | 33 | { |
34 | - return isset( $field['default'] ) |
|
34 | + return isset($field['default']) |
|
35 | 35 | ? $field['default'] |
36 | 36 | : ''; |
37 | 37 | } |
@@ -42,7 +42,7 @@ discard block |
||
42 | 42 | protected function getSettingFields( $path ) |
43 | 43 | { |
44 | 44 | $settings = glsr( DefaultsManager::class )->settings(); |
45 | - return array_filter( $settings, function( $key ) use( $path ) { |
|
45 | + return array_filter( $settings, function( $key ) use($path) { |
|
46 | 46 | return glsr( Helper::class )->startsWith( $path, $key ); |
47 | 47 | }, ARRAY_FILTER_USE_KEY ); |
48 | 48 | } |
@@ -53,14 +53,14 @@ discard block |
||
53 | 53 | */ |
54 | 54 | protected function getTemplateContext( $id ) |
55 | 55 | { |
56 | - $fields = $this->getSettingFields( $this->normalizeSettingPath( $id )); |
|
56 | + $fields = $this->getSettingFields( $this->normalizeSettingPath( $id ) ); |
|
57 | 57 | $rows = ''; |
58 | 58 | foreach( $fields as $name => $field ) { |
59 | 59 | $field = wp_parse_args( $field, [ |
60 | 60 | 'is_setting' => true, |
61 | 61 | 'name' => $name, |
62 | - ]); |
|
63 | - $rows.= new Field( $this->normalize( $field )); |
|
62 | + ] ); |
|
63 | + $rows .= new Field( $this->normalize( $field ) ); |
|
64 | 64 | } |
65 | 65 | return [ |
66 | 66 | 'rows' => $rows, |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | protected function getTemplateContextForTranslations() |
74 | 74 | { |
75 | 75 | $translations = glsr( Translator::class )->renderAll(); |
76 | - $class = empty( $translations ) |
|
76 | + $class = empty($translations) |
|
77 | 77 | ? 'glsr-hidden' |
78 | 78 | : ''; |
79 | 79 | return [ |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | $path, |
95 | 95 | glsr( Helper::class )->getPathValue( $path, glsr()->defaults ) |
96 | 96 | ); |
97 | - if( is_array( $expectedValue )) { |
|
97 | + if( is_array( $expectedValue ) ) { |
|
98 | 98 | return !in_array( $optionValue, $expectedValue ); |
99 | 99 | } |
100 | 100 | return $optionValue != $expectedValue; |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | */ |
117 | 117 | protected function normalizeDependsOn( array $field ) |
118 | 118 | { |
119 | - if( !empty( $field['depends_on'] ) && is_array( $field['depends_on'] )) { |
|
119 | + if( !empty($field['depends_on']) && is_array( $field['depends_on'] ) ) { |
|
120 | 120 | $path = key( $field['depends_on'] ); |
121 | 121 | $expectedValue = $field['depends_on'][$path]; |
122 | - $field['data-depends'] = json_encode([ |
|
122 | + $field['data-depends'] = json_encode( [ |
|
123 | 123 | 'name' => glsr( Helper::class )->convertPathToName( $path, OptionManager::databaseKey() ), |
124 | 124 | 'value' => $expectedValue, |
125 | - ], JSON_HEX_APOS|JSON_HEX_QUOT ); |
|
125 | + ], JSON_HEX_APOS | JSON_HEX_QUOT ); |
|
126 | 126 | $field['is_hidden'] = $this->isFieldHidden( $path, $expectedValue ); |
127 | 127 | } |
128 | 128 | return $field; |
@@ -133,9 +133,9 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function normalizeLabelAndLegend( array $field ) |
135 | 135 | { |
136 | - if( !empty( $field['label'] )) { |
|
136 | + if( !empty($field['label']) ) { |
|
137 | 137 | $field['legend'] = $field['label']; |
138 | - unset( $field['label'] ); |
|
138 | + unset($field['label']); |
|
139 | 139 | } |
140 | 140 | else { |
141 | 141 | $field['is_valid'] = false; |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function normalizeValue( array $field ) |
151 | 151 | { |
152 | - if( !isset( $field['value'] )) { |
|
152 | + if( !isset($field['value']) ) { |
|
153 | 153 | $field['value'] = glsr( OptionManager::class )->get( |
154 | 154 | $field['name'], |
155 | 155 | $this->getFieldDefault( $field ) |
@@ -26,7 +26,7 @@ discard block |
||
26 | 26 | 'is_valid' => true, |
27 | 27 | 'is_widget' => false, |
28 | 28 | 'path' => '', |
29 | - ]); |
|
29 | + ] ); |
|
30 | 30 | $this->normalize(); |
31 | 31 | } |
32 | 32 | |
@@ -45,7 +45,7 @@ discard block |
||
45 | 45 | { |
46 | 46 | if( !$this->field['is_valid'] )return; |
47 | 47 | if( $this->field['is_raw'] ) { |
48 | - return glsr( Builder::class )->{$this->field['type']}( $this->field ); |
|
48 | + return glsr( Builder::class )->{$this->field['type']}($this->field); |
|
49 | 49 | } |
50 | 50 | if( !$this->field['is_setting'] ) { |
51 | 51 | return $this->buildField(); |
@@ -73,9 +73,9 @@ discard block |
||
73 | 73 | 'context' => [ |
74 | 74 | 'class' => $this->getFieldClass(), |
75 | 75 | 'errors' => $this->getFieldErrors(), |
76 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
76 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
77 | 77 | ], |
78 | - ]); |
|
78 | + ] ); |
|
79 | 79 | } |
80 | 80 | |
81 | 81 | /** |
@@ -86,10 +86,10 @@ discard block |
||
86 | 86 | return glsr( Template::class )->build( 'partials/form/table-row', [ |
87 | 87 | 'context' => [ |
88 | 88 | 'class' => $this->getFieldClass(), |
89 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
89 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
90 | 90 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
91 | 91 | ], |
92 | - ]); |
|
92 | + ] ); |
|
93 | 93 | } |
94 | 94 | |
95 | 95 | /** |
@@ -98,16 +98,16 @@ discard block |
||
98 | 98 | protected function buildSettingMultiField() |
99 | 99 | { |
100 | 100 | $dependsOn = $this->getFieldDependsOn(); |
101 | - unset( $this->field['data-depends'] ); |
|
101 | + unset($this->field['data-depends']); |
|
102 | 102 | return glsr( Template::class )->build( 'partials/form/table-row-multiple', [ |
103 | 103 | 'context' => [ |
104 | 104 | 'class' => $this->getFieldClass(), |
105 | 105 | 'depends_on' => $dependsOn, |
106 | - 'field' => glsr( Builder::class )->{$this->field['type']}( $this->field ), |
|
106 | + 'field' => glsr( Builder::class )->{$this->field['type']}($this->field), |
|
107 | 107 | 'label' => glsr( Builder::class )->label( $this->field['legend'], ['for' => $this->field['id']] ), |
108 | 108 | 'legend' => $this->field['legend'], |
109 | 109 | ], |
110 | - ]); |
|
110 | + ] ); |
|
111 | 111 | } |
112 | 112 | |
113 | 113 | /** |
@@ -116,13 +116,13 @@ discard block |
||
116 | 116 | protected function getFieldClass() |
117 | 117 | { |
118 | 118 | $classes = []; |
119 | - if( !empty( $this->field['errors'] )) { |
|
119 | + if( !empty($this->field['errors']) ) { |
|
120 | 120 | $classes[] = 'glsr-has-error'; |
121 | 121 | } |
122 | 122 | if( $this->field['is_hidden'] ) { |
123 | 123 | $classes[] = 'hidden'; |
124 | 124 | } |
125 | - if( !empty( $this->field['required'] )) { |
|
125 | + if( !empty($this->field['required']) ) { |
|
126 | 126 | $classes[] = 'glsr-required'; |
127 | 127 | } |
128 | 128 | return implode( ' ', $classes ); |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | */ |
134 | 134 | protected function getFieldDependsOn() |
135 | 135 | { |
136 | - return !empty( $this->field['data-depends'] ) |
|
136 | + return !empty($this->field['data-depends']) |
|
137 | 137 | ? $this->field['data-depends'] |
138 | 138 | : ''; |
139 | 139 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | protected function getFieldErrors() |
145 | 145 | { |
146 | - if( empty( $this->field['errors'] ) || !is_array( $this->field['errors'] ))return; |
|
146 | + if( empty($this->field['errors']) || !is_array( $this->field['errors'] ) )return; |
|
147 | 147 | $errors = array_reduce( $this->field['errors'], function( $carry, $error ) { |
148 | 148 | return $carry.glsr( Builder::class )->span( $error, ['class' => 'glsr-field-error'] ); |
149 | 149 | }); |
@@ -170,13 +170,13 @@ discard block |
||
170 | 170 | 'name', 'type', |
171 | 171 | ]; |
172 | 172 | foreach( $requiredValues as $value ) { |
173 | - if( isset( $this->field[$value] ))continue; |
|
173 | + if( isset($this->field[$value]) )continue; |
|
174 | 174 | $missingValues[] = $value; |
175 | 175 | $this->field['is_valid'] = false; |
176 | 176 | } |
177 | - if( !empty( $missingValues )) { |
|
177 | + if( !empty($missingValues) ) { |
|
178 | 178 | glsr_log() |
179 | - ->warning( 'Field is missing: '.implode( ', ', $missingValues )) |
|
179 | + ->warning( 'Field is missing: '.implode( ', ', $missingValues ) ) |
|
180 | 180 | ->info( $this->field ); |
181 | 181 | } |
182 | 182 | return $this->field['is_valid']; |
@@ -190,7 +190,7 @@ discard block |
||
190 | 190 | if( !$this->isFieldValid() )return; |
191 | 191 | $this->field['path'] = $this->field['name']; |
192 | 192 | $className = glsr( Helper::class )->buildClassName( $this->field['type'], __NAMESPACE__.'\Fields' ); |
193 | - if( class_exists( $className )) { |
|
193 | + if( class_exists( $className ) ) { |
|
194 | 194 | $this->field = array_merge( |
195 | 195 | wp_parse_args( $this->field, $className::defaults() ), |
196 | 196 | $className::required() |
@@ -205,7 +205,7 @@ discard block |
||
205 | 205 | */ |
206 | 206 | protected function normalizeFieldId() |
207 | 207 | { |
208 | - if( isset( $this->field['id'] ) || $this->field['is_raw'] )return; |
|
208 | + if( isset($this->field['id']) || $this->field['is_raw'] )return; |
|
209 | 209 | $this->field['id'] = glsr( Helper::class )->convertPathToId( |
210 | 210 | $this->field['path'], |
211 | 211 | $this->getFieldPrefix() |
@@ -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() |
@@ -73,7 +73,9 @@ discard block |
||
73 | 73 | foreach( $this->rules as $attribute => $rules ) { |
74 | 74 | foreach( $rules as $rule ) { |
75 | 75 | $this->validateAttribute( $attribute, $rule ); |
76 | - if( $this->shouldStopValidating( $attribute ))break; |
|
76 | + if( $this->shouldStopValidating( $attribute )) { |
|
77 | + break; |
|
78 | + } |
|
77 | 79 | } |
78 | 80 | } |
79 | 81 | return $this->errors; |
@@ -89,7 +91,9 @@ discard block |
||
89 | 91 | public function validateAttribute( $attribute, $rule ) |
90 | 92 | { |
91 | 93 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
92 | - if( $rule == '' )return; |
|
94 | + if( $rule == '' ) { |
|
95 | + return; |
|
96 | + } |
|
93 | 97 | $value = $this->getValue( $attribute ); |
94 | 98 | if( !method_exists( $this, $method = 'validate'.$rule )) { |
95 | 99 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
@@ -158,7 +162,9 @@ discard block |
||
158 | 162 | */ |
159 | 163 | protected function getRule( $attribute, $rules ) |
160 | 164 | { |
161 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
165 | + if( !array_key_exists( $attribute, $this->rules )) { |
|
166 | + return; |
|
167 | + } |
|
162 | 168 | $rules = (array) $rules; |
163 | 169 | foreach( $this->rules[$attribute] as $rule ) { |
164 | 170 | list( $rule, $parameters ) = $this->parseRule( $rule ); |
@@ -318,7 +324,9 @@ discard block |
||
318 | 324 | $message = isset( $strings[$key] ) |
319 | 325 | ? $strings[$key] |
320 | 326 | : false; |
321 | - if( !$message )return; |
|
327 | + if( !$message ) { |
|
328 | + return; |
|
329 | + } |
|
322 | 330 | if( method_exists( $this, $method = 'replace'.$rule )) { |
323 | 331 | $message = $this->$method( $message, $parameters ); |
324 | 332 | } |
@@ -73,7 +73,7 @@ discard block |
||
73 | 73 | foreach( $this->rules as $attribute => $rules ) { |
74 | 74 | foreach( $rules as $rule ) { |
75 | 75 | $this->validateAttribute( $attribute, $rule ); |
76 | - if( $this->shouldStopValidating( $attribute ))break; |
|
76 | + if( $this->shouldStopValidating( $attribute ) )break; |
|
77 | 77 | } |
78 | 78 | } |
79 | 79 | return $this->errors; |
@@ -88,13 +88,13 @@ discard block |
||
88 | 88 | */ |
89 | 89 | public function validateAttribute( $attribute, $rule ) |
90 | 90 | { |
91 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
91 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
92 | 92 | if( $rule == '' )return; |
93 | 93 | $value = $this->getValue( $attribute ); |
94 | - if( !method_exists( $this, $method = 'validate'.$rule )) { |
|
94 | + if( !method_exists( $this, $method = 'validate'.$rule ) ) { |
|
95 | 95 | throw new BadMethodCallException( "Method [$method] does not exist." ); |
96 | 96 | } |
97 | - if( !$this->$method( $value, $attribute, $parameters )) { |
|
97 | + if( !$this->$method( $value, $attribute, $parameters ) ) { |
|
98 | 98 | $this->addFailure( $attribute, $rule, $parameters ); |
99 | 99 | } |
100 | 100 | } |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | */ |
144 | 144 | protected function getMessage( $attribute, $rule, array $parameters ) |
145 | 145 | { |
146 | - if( in_array( $rule, $this->sizeRules )) { |
|
146 | + if( in_array( $rule, $this->sizeRules ) ) { |
|
147 | 147 | return $this->getSizeMessage( $attribute, $rule, $parameters ); |
148 | 148 | } |
149 | 149 | $lowerRule = glsr( Helper::class )->snakeCase( $rule ); |
@@ -158,11 +158,11 @@ discard block |
||
158 | 158 | */ |
159 | 159 | protected function getRule( $attribute, $rules ) |
160 | 160 | { |
161 | - if( !array_key_exists( $attribute, $this->rules ))return; |
|
162 | - $rules = (array) $rules; |
|
161 | + if( !array_key_exists( $attribute, $this->rules ) )return; |
|
162 | + $rules = (array)$rules; |
|
163 | 163 | foreach( $this->rules[$attribute] as $rule ) { |
164 | - list( $rule, $parameters ) = $this->parseRule( $rule ); |
|
165 | - if( in_array( $rule, $rules )) { |
|
164 | + list($rule, $parameters) = $this->parseRule( $rule ); |
|
165 | + if( in_array( $rule, $rules ) ) { |
|
166 | 166 | return [$rule, $parameters]; |
167 | 167 | } |
168 | 168 | } |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | if( is_numeric( $value ) && $hasNumeric ) { |
181 | 181 | return $value; |
182 | 182 | } |
183 | - elseif( is_array( $value )) { |
|
183 | + elseif( is_array( $value ) ) { |
|
184 | 184 | return count( $value ); |
185 | 185 | } |
186 | 186 | return mb_strlen( $value ); |
@@ -207,7 +207,7 @@ discard block |
||
207 | 207 | */ |
208 | 208 | protected function getValue( $attribute ) |
209 | 209 | { |
210 | - if( isset( $this->data[$attribute] )) { |
|
210 | + if( isset($this->data[$attribute]) ) { |
|
211 | 211 | return $this->data[$attribute]; |
212 | 212 | } |
213 | 213 | } |
@@ -220,7 +220,7 @@ discard block |
||
220 | 220 | */ |
221 | 221 | protected function hasRule( $attribute, $rules ) |
222 | 222 | { |
223 | - return !is_null( $this->getRule( $attribute, $rules )); |
|
223 | + return !is_null( $this->getRule( $attribute, $rules ) ); |
|
224 | 224 | } |
225 | 225 | |
226 | 226 | /** |
@@ -259,11 +259,11 @@ discard block |
||
259 | 259 | $parameters = []; |
260 | 260 | // example: {rule}:{parameters} |
261 | 261 | if( strpos( $rule, ':' ) !== false ) { |
262 | - list( $rule, $parameter ) = explode( ':', $rule, 2 ); |
|
262 | + list($rule, $parameter) = explode( ':', $rule, 2 ); |
|
263 | 263 | // example: {parameter1,parameter2,...} |
264 | 264 | $parameters = $this->parseParameters( $rule, $parameter ); |
265 | 265 | } |
266 | - $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ))); |
|
266 | + $rule = ucwords( str_replace( ['-', '_'], ' ', trim( $rule ) ) ); |
|
267 | 267 | $rule = str_replace( ' ', '', $rule ); |
268 | 268 | return [$rule, $parameters]; |
269 | 269 | } |
@@ -290,7 +290,7 @@ discard block |
||
290 | 290 | protected function shouldStopValidating( $attribute ) |
291 | 291 | { |
292 | 292 | return $this->hasRule( $attribute, $this->implicitRules ) |
293 | - && isset( $this->failedRules[$attribute] ) |
|
293 | + && isset($this->failedRules[$attribute]) |
|
294 | 294 | && array_intersect( array_keys( $this->failedRules[$attribute] ), $this->implicitRules ); |
295 | 295 | } |
296 | 296 | |
@@ -315,11 +315,11 @@ discard block |
||
315 | 315 | 'regex' => __( 'The format is invalid.', 'site-reviews' ), |
316 | 316 | 'required' => __( 'This field is required.', 'site-reviews' ), |
317 | 317 | ]; |
318 | - $message = isset( $strings[$key] ) |
|
318 | + $message = isset($strings[$key]) |
|
319 | 319 | ? $strings[$key] |
320 | 320 | : false; |
321 | 321 | if( !$message )return; |
322 | - if( method_exists( $this, $method = 'replace'.$rule )) { |
|
322 | + if( method_exists( $this, $method = 'replace'.$rule ) ) { |
|
323 | 323 | $message = $this->$method( $message, $parameters ); |
324 | 324 | } |
325 | 325 | return $message; |
@@ -102,7 +102,9 @@ discard block |
||
102 | 102 | protected function sendNotification( $postId ) |
103 | 103 | { |
104 | 104 | $notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' ); |
105 | - if( !in_array( $notificationType, ['default','custom','webhook'] ))return; |
|
105 | + if( !in_array( $notificationType, ['default','custom','webhook'] )) { |
|
106 | + return; |
|
107 | + } |
|
106 | 108 | $assignedToTitle = get_the_title( (int)$this->command->assigned_to ); |
107 | 109 | $notificationSubject = _nx( |
108 | 110 | 'New %s-star review', |
@@ -150,7 +152,9 @@ discard block |
||
150 | 152 | */ |
151 | 153 | protected function sendWebhookNotification( array $args ) |
152 | 154 | { |
153 | - if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return; |
|
155 | + if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' ))) { |
|
156 | + return; |
|
157 | + } |
|
154 | 158 | $notification = $this->createWebhookNotification( $args ); |
155 | 159 | $result = wp_remote_post( $endpoint, [ |
156 | 160 | 'blocking' => false, |
@@ -31,7 +31,7 @@ discard block |
||
31 | 31 | } |
32 | 32 | $this->sendNotification( $postId ); |
33 | 33 | do_action( 'site-reviews/local/review/submitted', $postId, $command ); |
34 | - glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' )); |
|
34 | + glsr( Session::class )->set( $command->form_id.'message', __( 'Your review has been submitted!', 'site-reviews' ) ); |
|
35 | 35 | if( $command->ajax_request ) { |
36 | 36 | glsr( Session::class )->clear(); |
37 | 37 | return; |
@@ -81,8 +81,8 @@ discard block |
||
81 | 81 | if( $this->command->author ) { |
82 | 82 | $fields[] = ['value' => trim( $this->command->author.$this->command->email.' - '.$this->command->ip_address )]; |
83 | 83 | } |
84 | - $fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ))]; |
|
85 | - return json_encode([ |
|
84 | + $fields[] = ['value' => sprintf( '<%s|%s>', $args['notification_link'], __( 'View Review', 'site-reviews' ) )]; |
|
85 | + return json_encode( [ |
|
86 | 86 | 'icon_url' => glsr()->url( 'assets/img/icon.png' ), |
87 | 87 | 'username' => glsr()->name, |
88 | 88 | 'attachments' => [[ |
@@ -91,7 +91,7 @@ discard block |
||
91 | 91 | 'fallback' => $this->createEmailNotification( $args )->read( 'plaintext' ), |
92 | 92 | 'fields' => $fields, |
93 | 93 | ]], |
94 | - ]); |
|
94 | + ] ); |
|
95 | 95 | } |
96 | 96 | |
97 | 97 | /** |
@@ -101,12 +101,12 @@ discard block |
||
101 | 101 | protected function sendNotification( $postId ) |
102 | 102 | { |
103 | 103 | $notificationType = glsr( OptionManager::class )->get( 'settings.general.notification' ); |
104 | - if( !in_array( $notificationType, ['default','custom','webhook'] ))return; |
|
104 | + if( !in_array( $notificationType, ['default', 'custom', 'webhook'] ) )return; |
|
105 | 105 | $assignedToTitle = get_the_title( (int)$this->command->assigned_to ); |
106 | 106 | $notificationSubject = _nx( |
107 | 107 | 'New %s-star review', |
108 | 108 | 'New %s-star review of: %s', |
109 | - intval( empty( $assignedToTitle )), |
|
109 | + intval( empty($assignedToTitle) ), |
|
110 | 110 | 'The text is different depending on whether or not the review has been assigned to a post.', |
111 | 111 | 'site-reviews' |
112 | 112 | ); |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | sprintf( $notificationSubject, $this->command->rating, $assignedToTitle ) |
116 | 116 | ); |
117 | 117 | $args = [ |
118 | - 'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ))), |
|
118 | + 'notification_link' => esc_url( admin_url( sprintf( 'post.php?post=%s&action=edit', $postId ) ) ), |
|
119 | 119 | 'notification_title' => $notificationTitle, |
120 | 120 | 'notification_type' => $notificationType, |
121 | 121 | ]; |
@@ -133,7 +133,7 @@ discard block |
||
133 | 133 | $args['recipient'] = $args['notification_type'] !== 'default' |
134 | 134 | ? glsr( OptionManager::class )->get( 'settings.general.notification_email' ) |
135 | 135 | : get_option( 'admin_email' ); |
136 | - if( empty( $args['recipient'] )) { |
|
136 | + if( empty($args['recipient']) ) { |
|
137 | 137 | glsr_log()->error( 'Email notification was not sent: missing email, subject, or message.' ); |
138 | 138 | } |
139 | 139 | else { |
@@ -149,7 +149,7 @@ discard block |
||
149 | 149 | */ |
150 | 150 | protected function sendWebhookNotification( array $args ) |
151 | 151 | { |
152 | - if( !( $endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )))return; |
|
152 | + if( !($endpoint = glsr( OptionManager::class )->get( 'settings.general.webhook_url' )) )return; |
|
153 | 153 | $notification = $this->createWebhookNotification( $args ); |
154 | 154 | $result = wp_remote_post( $endpoint, [ |
155 | 155 | 'blocking' => false, |
@@ -160,8 +160,8 @@ discard block |
||
160 | 160 | 'redirection' => 5, |
161 | 161 | 'sslverify' => false, |
162 | 162 | 'timeout' => 45, |
163 | - ]); |
|
164 | - if( is_wp_error( $result )) { |
|
163 | + ] ); |
|
164 | + if( is_wp_error( $result ) ) { |
|
165 | 165 | glsr_log()->error( $result->get_error_message() ); |
166 | 166 | } |
167 | 167 | } |
@@ -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"> |