@@ -22,7 +22,8 @@ |
||
22 | 22 | protected $public; |
23 | 23 | protected $translator; |
24 | 24 | |
25 | - public function __construct( Application $app ) { |
|
25 | + public function __construct( Application $app ) |
|
26 | + { |
|
26 | 27 | $this->app = $app; |
27 | 28 | $this->admin = $app->make( AdminController::class ); |
28 | 29 | $this->basename = plugin_basename( $app->file ); |
@@ -38,27 +38,27 @@ |
||
38 | 38 | */ |
39 | 39 | public function run() |
40 | 40 | { |
41 | - add_filter( 'mce_external_plugins', [$this->admin, 'filterTinymcePlugins'], 15 ); |
|
42 | - add_filter( 'plugin_action_links_'.$this->basename, [$this->admin, 'filterActionLinks'] ); |
|
43 | - add_filter( 'dashboard_glance_items', [$this->admin, 'filterDashboardGlanceItems'] ); |
|
44 | - add_filter( 'wp_editor_settings', [$this->editor, 'filterEditorSettings'] ); |
|
45 | - add_filter( 'the_editor', [$this->editor, 'filterEditorTextarea'] ); |
|
46 | - add_filter( 'gettext', [$this->editor, 'filterPostStatusLabels'], 10, 3 ); |
|
47 | - add_filter( 'gettext_with_context', [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 ); |
|
48 | - add_filter( 'post_updated_messages', [$this->editor, 'filterUpdateMessages'] ); |
|
49 | - add_filter( 'bulk_post_updated_messages', [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 ); |
|
50 | - add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns', [$this->listtable, 'filterColumnsForPostType'] ); |
|
51 | - add_filter( 'post_date_column_status', [$this->listtable, 'filterDateColumnStatus'], 10, 2 ); |
|
52 | - add_filter( 'default_hidden_columns', [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 ); |
|
53 | - add_filter( 'display_post_states', [$this->listtable, 'filterPostStates'], 10, 2 ); |
|
54 | - add_filter( 'post_row_actions', [$this->listtable, 'filterRowActions'], 10, 2 ); |
|
41 | + add_filter( 'mce_external_plugins', [$this->admin, 'filterTinymcePlugins'], 15 ); |
|
42 | + add_filter( 'plugin_action_links_'.$this->basename, [$this->admin, 'filterActionLinks'] ); |
|
43 | + add_filter( 'dashboard_glance_items', [$this->admin, 'filterDashboardGlanceItems'] ); |
|
44 | + add_filter( 'wp_editor_settings', [$this->editor, 'filterEditorSettings'] ); |
|
45 | + add_filter( 'the_editor', [$this->editor, 'filterEditorTextarea'] ); |
|
46 | + add_filter( 'gettext', [$this->editor, 'filterPostStatusLabels'], 10, 3 ); |
|
47 | + add_filter( 'gettext_with_context', [$this->editor, 'filterPostStatusLabelsWithContext'], 10, 4 ); |
|
48 | + add_filter( 'post_updated_messages', [$this->editor, 'filterUpdateMessages'] ); |
|
49 | + add_filter( 'bulk_post_updated_messages', [$this->listtable, 'filterBulkUpdateMessages'], 10, 2 ); |
|
50 | + add_filter( 'manage_'.Application::POST_TYPE.'_posts_columns', [$this->listtable, 'filterColumnsForPostType'] ); |
|
51 | + add_filter( 'post_date_column_status', [$this->listtable, 'filterDateColumnStatus'], 10, 2 ); |
|
52 | + add_filter( 'default_hidden_columns', [$this->listtable, 'filterDefaultHiddenColumns'], 10, 2 ); |
|
53 | + add_filter( 'display_post_states', [$this->listtable, 'filterPostStates'], 10, 2 ); |
|
54 | + add_filter( 'post_row_actions', [$this->listtable, 'filterRowActions'], 10, 2 ); |
|
55 | 55 | add_filter( 'manage_edit-'.Application::POST_TYPE.'_sortable_columns', [$this->listtable, 'filterSortableColumns'] ); |
56 | - add_filter( 'ngettext', [$this->listtable, 'filterStatusText'], 10, 5 ); |
|
57 | - add_filter( 'script_loader_tag', [$this->public, 'filterEnqueuedScripts'], 10, 2 ); |
|
58 | - add_filter( 'query_vars', [$this->public, 'filterQueryVars'] ); |
|
59 | - add_filter( 'gettext', [$this->translator, 'filterGettext'], 10, 3 ); |
|
60 | - add_filter( 'gettext_with_context', [$this->translator, 'filterGettextWithContext'], 10, 4 ); |
|
61 | - add_filter( 'ngettext', [$this->translator, 'filterNgettext'], 10, 5 ); |
|
62 | - add_filter( 'ngettext_with_context', [$this->translator, 'filterNgettextWithContext'], 10, 6 ); |
|
56 | + add_filter( 'ngettext', [$this->listtable, 'filterStatusText'], 10, 5 ); |
|
57 | + add_filter( 'script_loader_tag', [$this->public, 'filterEnqueuedScripts'], 10, 2 ); |
|
58 | + add_filter( 'query_vars', [$this->public, 'filterQueryVars'] ); |
|
59 | + add_filter( 'gettext', [$this->translator, 'filterGettext'], 10, 3 ); |
|
60 | + add_filter( 'gettext_with_context', [$this->translator, 'filterGettextWithContext'], 10, 4 ); |
|
61 | + add_filter( 'ngettext', [$this->translator, 'filterNgettext'], 10, 5 ); |
|
62 | + add_filter( 'ngettext_with_context', [$this->translator, 'filterNgettextWithContext'], 10, 6 ); |
|
63 | 63 | } |
64 | 64 | } |
@@ -25,7 +25,8 @@ |
||
25 | 25 | protected $router; |
26 | 26 | protected $settings; |
27 | 27 | |
28 | - public function __construct( Application $app ) { |
|
28 | + public function __construct( Application $app ) |
|
29 | + { |
|
29 | 30 | $this->app = $app; |
30 | 31 | $this->admin = $app->make( AdminController::class ); |
31 | 32 | $this->editor = $app->make( EditorController::class ); |
@@ -42,47 +42,47 @@ |
||
42 | 42 | */ |
43 | 43 | public function run() |
44 | 44 | { |
45 | - add_action( 'admin_enqueue_scripts', [$this->admin, 'enqueueAssets'] ); |
|
46 | - add_action( 'admin_init', [$this->admin, 'registerShortcodeButtons'] ); |
|
47 | - add_action( 'edit_form_after_title', [$this->admin, 'renderReviewEditor'] ); |
|
48 | - add_action( 'edit_form_top', [$this->admin, 'renderReviewNotice'] ); |
|
49 | - add_action( 'media_buttons', [$this->admin, 'renderTinymceButton'], 11 ); |
|
50 | - add_action( 'plugins_loaded', [$this->app, 'getDefaults'], 11 ); |
|
51 | - add_action( 'plugins_loaded', [$this->app, 'registerAddons'] ); |
|
52 | - add_action( 'plugins_loaded', [$this->app, 'registerLanguages'] ); |
|
53 | - add_action( 'plugins_loaded', [$this->app, 'registerReviewTypes'] ); |
|
54 | - add_action( 'upgrader_process_complete', [$this->app, 'upgraded'], 10, 2 ); |
|
55 | - add_action( 'admin_enqueue_scripts', [$this->editor, 'customizePostStatusLabels'] ); |
|
56 | - add_action( 'site-reviews/create/review', [$this->editor, 'onCreateReview'], 10, 3 ); |
|
57 | - add_action( 'before_delete_post', [$this->editor, 'onDeleteReview'] ); |
|
58 | - add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'onSaveReview'], 20, 2 ); |
|
59 | - add_action( 'add_meta_boxes', [$this->editor, 'registerMetaBoxes'] ); |
|
60 | - add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 ); |
|
61 | - add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] ); |
|
62 | - add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] ); |
|
63 | - add_action( 'admin_action_revert', [$this->editor, 'revertReview'] ); |
|
64 | - add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'] ); |
|
65 | - add_action( 'admin_action_approve', [$this->listtable, 'approve'] ); |
|
66 | - add_action( 'bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2 ); |
|
67 | - add_action( 'restrict_manage_posts', [$this->listtable, 'renderColumnFilters'] ); |
|
68 | - add_action( 'manage_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2 ); |
|
69 | - add_action( 'save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields'] ); |
|
70 | - add_action( 'pre_get_posts', [$this->listtable, 'setQueryForColumn'] ); |
|
71 | - add_action( 'admin_action_unapprove', [$this->listtable, 'unapprove'] ); |
|
72 | - add_action( 'init', [$this->main, 'registerPostType'], 8 ); |
|
73 | - add_action( 'init', [$this->main, 'registerShortcodes'] ); |
|
74 | - add_action( 'init', [$this->main, 'registerTaxonomy'] ); |
|
75 | - add_action( 'widgets_init', [$this->main, 'registerWidgets'] ); |
|
76 | - add_action( 'wp_footer', [$this->main, 'renderSchema'] ); |
|
77 | - add_action( 'admin_menu', [$this->menu, 'registerMenuCount'] ); |
|
78 | - add_action( 'admin_menu', [$this->menu, 'registerSubMenus'] ); |
|
79 | - add_action( 'admin_init', [$this->menu, 'setCustomPermissions'], 999 ); |
|
80 | - add_action( 'wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999 ); |
|
81 | - add_action( 'admin_init', [$this->router, 'routeAdminPostRequest'] ); |
|
82 | - add_action( 'wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] ); |
|
45 | + add_action( 'admin_enqueue_scripts', [$this->admin, 'enqueueAssets'] ); |
|
46 | + add_action( 'admin_init', [$this->admin, 'registerShortcodeButtons'] ); |
|
47 | + add_action( 'edit_form_after_title', [$this->admin, 'renderReviewEditor'] ); |
|
48 | + add_action( 'edit_form_top', [$this->admin, 'renderReviewNotice'] ); |
|
49 | + add_action( 'media_buttons', [$this->admin, 'renderTinymceButton'], 11 ); |
|
50 | + add_action( 'plugins_loaded', [$this->app, 'getDefaults'], 11 ); |
|
51 | + add_action( 'plugins_loaded', [$this->app, 'registerAddons'] ); |
|
52 | + add_action( 'plugins_loaded', [$this->app, 'registerLanguages'] ); |
|
53 | + add_action( 'plugins_loaded', [$this->app, 'registerReviewTypes'] ); |
|
54 | + add_action( 'upgrader_process_complete', [$this->app, 'upgraded'], 10, 2 ); |
|
55 | + add_action( 'admin_enqueue_scripts', [$this->editor, 'customizePostStatusLabels'] ); |
|
56 | + add_action( 'site-reviews/create/review', [$this->editor, 'onCreateReview'], 10, 3 ); |
|
57 | + add_action( 'before_delete_post', [$this->editor, 'onDeleteReview'] ); |
|
58 | + add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'onSaveReview'], 20, 2 ); |
|
59 | + add_action( 'add_meta_boxes', [$this->editor, 'registerMetaBoxes'] ); |
|
60 | + add_action( 'admin_print_scripts', [$this->editor, 'removeAutosave'], 999 ); |
|
61 | + add_action( 'admin_menu', [$this->editor, 'removeMetaBoxes'] ); |
|
62 | + add_action( 'post_submitbox_misc_actions', [$this->editor, 'renderPinnedInPublishMetaBox'] ); |
|
63 | + add_action( 'admin_action_revert', [$this->editor, 'revertReview'] ); |
|
64 | + add_action( 'save_post_'.Application::POST_TYPE, [$this->editor, 'saveMetaboxes'] ); |
|
65 | + add_action( 'admin_action_approve', [$this->listtable, 'approve'] ); |
|
66 | + add_action( 'bulk_edit_custom_box', [$this->listtable, 'renderBulkEditFields'], 10, 2 ); |
|
67 | + add_action( 'restrict_manage_posts', [$this->listtable, 'renderColumnFilters'] ); |
|
68 | + add_action( 'manage_posts_custom_column', [$this->listtable, 'renderColumnValues'], 10, 2 ); |
|
69 | + add_action( 'save_post_'.Application::POST_TYPE, [$this->listtable, 'saveBulkEditFields'] ); |
|
70 | + add_action( 'pre_get_posts', [$this->listtable, 'setQueryForColumn'] ); |
|
71 | + add_action( 'admin_action_unapprove', [$this->listtable, 'unapprove'] ); |
|
72 | + add_action( 'init', [$this->main, 'registerPostType'], 8 ); |
|
73 | + add_action( 'init', [$this->main, 'registerShortcodes'] ); |
|
74 | + add_action( 'init', [$this->main, 'registerTaxonomy'] ); |
|
75 | + add_action( 'widgets_init', [$this->main, 'registerWidgets'] ); |
|
76 | + add_action( 'wp_footer', [$this->main, 'renderSchema'] ); |
|
77 | + add_action( 'admin_menu', [$this->menu, 'registerMenuCount'] ); |
|
78 | + add_action( 'admin_menu', [$this->menu, 'registerSubMenus'] ); |
|
79 | + add_action( 'admin_init', [$this->menu, 'setCustomPermissions'], 999 ); |
|
80 | + add_action( 'wp_enqueue_scripts', [$this->public, 'enqueueAssets'], 999 ); |
|
81 | + add_action( 'admin_init', [$this->router, 'routeAdminPostRequest'] ); |
|
82 | + add_action( 'wp_ajax_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] ); |
|
83 | 83 | add_action( 'wp_ajax_nopriv_'.Application::PREFIX.'action', [$this->router, 'routeAjaxRequest'] ); |
84 | - add_action( 'init', [$this->router, 'routePublicPostRequest'] ); |
|
85 | - add_action( 'admin_init', [$this->router, 'routeWebhookRequest'] ); |
|
86 | - add_action( 'admin_init', [$this->settings, 'registerSettings'] ); |
|
84 | + add_action( 'init', [$this->router, 'routePublicPostRequest'] ); |
|
85 | + add_action( 'admin_init', [$this->router, 'routeWebhookRequest'] ); |
|
86 | + add_action( 'admin_init', [$this->settings, 'registerSettings'] ); |
|
87 | 87 | } |
88 | 88 | } |
@@ -55,11 +55,11 @@ discard block |
||
55 | 55 | */ |
56 | 56 | public function validateRequest( array $request ) |
57 | 57 | { |
58 | - if( !$this->isRequestValid( $request )) { |
|
58 | + if( !$this->isRequestValid( $request ) ) { |
|
59 | 59 | $this->error = __( 'Please fix the submission errors.', 'site-reviews' ); |
60 | 60 | return $request; |
61 | 61 | } |
62 | - if( empty( $request['title'] )) { |
|
62 | + if( empty($request['title']) ) { |
|
63 | 63 | $request['title'] = __( 'No Title', 'site-reviews' ); |
64 | 64 | } |
65 | 65 | return array_merge( glsr( ValidateReviewDefaults::class )->defaults(), $request ); |
@@ -73,14 +73,14 @@ discard block |
||
73 | 73 | $rules = array_intersect_key( |
74 | 74 | apply_filters( 'site-reviews/validation/rules', static::VALIDATION_RULES ), |
75 | 75 | array_flip( array_merge( |
76 | - ['rating','terms'], |
|
76 | + ['rating', 'terms'], |
|
77 | 77 | glsr( OptionManager::class )->get( 'settings.submissions.required', [] ) |
78 | - )) |
|
78 | + ) ) |
|
79 | 79 | ); |
80 | - $excluded = isset( $request['excluded'] ) |
|
80 | + $excluded = isset($request['excluded']) |
|
81 | 81 | ? json_decode( $request['excluded'] ) |
82 | 82 | : []; |
83 | - return array_diff_key( $rules, array_flip( $excluded )); |
|
83 | + return array_diff_key( $rules, array_flip( $excluded ) ); |
|
84 | 84 | } |
85 | 85 | |
86 | 86 | /** |
@@ -93,14 +93,14 @@ discard block |
||
93 | 93 | return true; |
94 | 94 | } |
95 | 95 | $recaptchaResponse = filter_input( INPUT_POST, 'g-recaptcha-response' ); |
96 | - if( empty( $recaptchaResponse )) { |
|
96 | + if( empty($recaptchaResponse) ) { |
|
97 | 97 | return null; //if response is empty we need to return null |
98 | 98 | } |
99 | 99 | if( $integration == 'custom' ) { |
100 | 100 | return $this->isRecaptchaValid( $recaptchaResponse ); |
101 | 101 | } |
102 | 102 | if( $integration == 'invisible-recaptcha' ) { |
103 | - return boolval( apply_filters( 'google_invre_is_valid_request_filter', true )); |
|
103 | + return boolval( apply_filters( 'google_invre_is_valid_request_filter', true ) ); |
|
104 | 104 | } |
105 | 105 | return false; |
106 | 106 | } |
@@ -110,17 +110,17 @@ discard block |
||
110 | 110 | */ |
111 | 111 | protected function isRecaptchaValid( $recaptchaResponse ) |
112 | 112 | { |
113 | - $endpoint = add_query_arg([ |
|
113 | + $endpoint = add_query_arg( [ |
|
114 | 114 | 'remoteip' => glsr( Helper::class )->getIpAddress(), |
115 | 115 | 'response' => $recaptchaResponse, |
116 | 116 | 'secret' => glsr( OptionManager::class )->get( 'settings.submissions.recaptcha.secret' ), |
117 | 117 | ], 'https://www.google.com/recaptcha/api/siteverify' ); |
118 | - if( is_wp_error( $response = wp_remote_get( $endpoint ))) { |
|
118 | + if( is_wp_error( $response = wp_remote_get( $endpoint ) ) ) { |
|
119 | 119 | glsr_log()->error( $response->get_error_message() ); |
120 | 120 | return false; |
121 | 121 | } |
122 | - $response = json_decode( wp_remote_retrieve_body( $response )); |
|
123 | - if( !empty( $response->success )) { |
|
122 | + $response = json_decode( wp_remote_retrieve_body( $response ) ); |
|
123 | + if( !empty($response->success) ) { |
|
124 | 124 | return boolval( $response->success ); |
125 | 125 | } |
126 | 126 | $errorCodes = [ |
@@ -143,7 +143,7 @@ discard block |
||
143 | 143 | { |
144 | 144 | $rules = $this->getValidationRules( $request ); |
145 | 145 | $errors = glsr( Validator::class )->validate( $request, $rules ); |
146 | - if( empty( $errors )) { |
|
146 | + if( empty($errors) ) { |
|
147 | 147 | return true; |
148 | 148 | } |
149 | 149 | $this->setSessionValues( 'errors', $errors ); |
@@ -160,7 +160,7 @@ discard block |
||
160 | 160 | protected function setSessionValues( $type, $value, $loggedMessage = '' ) |
161 | 161 | { |
162 | 162 | glsr( Session::class )->set( $this->form_id.$type, $value ); |
163 | - if( !empty( $loggedMessage )) { |
|
163 | + if( !empty($loggedMessage) ) { |
|
164 | 164 | glsr_log()->warning( $loggedMessage ); |
165 | 165 | glsr_log()->warning( $this->request ); |
166 | 166 | } |
@@ -171,8 +171,8 @@ discard block |
||
171 | 171 | */ |
172 | 172 | protected function validateAkismet() |
173 | 173 | { |
174 | - if( !empty( $this->error ))return; |
|
175 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
174 | + if( !empty($this->error) )return; |
|
175 | + if( !glsr( Akismet::class )->isSpam( $this->request ) )return; |
|
176 | 176 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
177 | 177 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
178 | 178 | } |
@@ -182,8 +182,8 @@ discard block |
||
182 | 182 | */ |
183 | 183 | protected function validateBlacklist() |
184 | 184 | { |
185 | - if( !empty( $this->error ))return; |
|
186 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
185 | + if( !empty($this->error) )return; |
|
186 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request ) )return; |
|
187 | 187 | $blacklistAction = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' ); |
188 | 188 | if( $blacklistAction == 'unapprove' ) { |
189 | 189 | $this->request['blacklisted'] = true; |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | */ |
200 | 200 | protected function validateCustom() |
201 | 201 | { |
202 | - if( !empty( $this->error ))return; |
|
202 | + if( !empty($this->error) )return; |
|
203 | 203 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
204 | 204 | if( $validated === true )return; |
205 | 205 | $this->setSessionValues( 'errors', [] ); |
@@ -214,8 +214,8 @@ discard block |
||
214 | 214 | */ |
215 | 215 | protected function validateHoneyPot() |
216 | 216 | { |
217 | - if( !empty( $this->error ))return; |
|
218 | - if( empty( $this->request['gotcha'] ))return; |
|
217 | + if( !empty($this->error) )return; |
|
218 | + if( empty($this->request['gotcha']) )return; |
|
219 | 219 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
220 | 220 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
221 | 221 | } |
@@ -225,9 +225,9 @@ discard block |
||
225 | 225 | */ |
226 | 226 | protected function validateRecaptcha() |
227 | 227 | { |
228 | - if( !empty( $this->error ))return; |
|
228 | + if( !empty($this->error) )return; |
|
229 | 229 | $isValid = $this->isRecaptchaResponseValid(); |
230 | - if( is_null( $isValid )) { |
|
230 | + if( is_null( $isValid ) ) { |
|
231 | 231 | $this->setSessionValues( 'recaptcha', true ); |
232 | 232 | $this->recaptchaIsUnset = true; |
233 | 233 | } |
@@ -171,8 +171,12 @@ discard block |
||
171 | 171 | */ |
172 | 172 | protected function validateAkismet() |
173 | 173 | { |
174 | - if( !empty( $this->error ))return; |
|
175 | - if( !glsr( Akismet::class )->isSpam( $this->request ))return; |
|
174 | + if( !empty( $this->error )) { |
|
175 | + return; |
|
176 | + } |
|
177 | + if( !glsr( Akismet::class )->isSpam( $this->request )) { |
|
178 | + return; |
|
179 | + } |
|
176 | 180 | $this->setSessionValues( 'errors', [], 'Akismet caught a spam submission:' ); |
177 | 181 | $this->error = __( 'Your review cannot be submitted at this time. Please try again later.', 'site-reviews' ); |
178 | 182 | } |
@@ -182,8 +186,12 @@ discard block |
||
182 | 186 | */ |
183 | 187 | protected function validateBlacklist() |
184 | 188 | { |
185 | - if( !empty( $this->error ))return; |
|
186 | - if( !glsr( Blacklist::class )->isBlacklisted( $this->request ))return; |
|
189 | + if( !empty( $this->error )) { |
|
190 | + return; |
|
191 | + } |
|
192 | + if( !glsr( Blacklist::class )->isBlacklisted( $this->request )) { |
|
193 | + return; |
|
194 | + } |
|
187 | 195 | $blacklistAction = glsr( OptionManager::class )->get( 'settings.submissions.blacklist.action' ); |
188 | 196 | if( $blacklistAction == 'unapprove' ) { |
189 | 197 | $this->request['blacklisted'] = true; |
@@ -199,9 +207,13 @@ discard block |
||
199 | 207 | */ |
200 | 208 | protected function validateCustom() |
201 | 209 | { |
202 | - if( !empty( $this->error ))return; |
|
210 | + if( !empty( $this->error )) { |
|
211 | + return; |
|
212 | + } |
|
203 | 213 | $validated = apply_filters( 'site-reviews/validate/review/submission', true, $this->request ); |
204 | - if( $validated === true )return; |
|
214 | + if( $validated === true ) { |
|
215 | + return; |
|
216 | + } |
|
205 | 217 | $this->setSessionValues( 'errors', [] ); |
206 | 218 | $this->setSessionValues( 'values', $this->request ); |
207 | 219 | $this->error = is_string( $validated ) |
@@ -214,8 +226,12 @@ discard block |
||
214 | 226 | */ |
215 | 227 | protected function validateHoneyPot() |
216 | 228 | { |
217 | - if( !empty( $this->error ))return; |
|
218 | - if( empty( $this->request['gotcha'] ))return; |
|
229 | + if( !empty( $this->error )) { |
|
230 | + return; |
|
231 | + } |
|
232 | + if( empty( $this->request['gotcha'] )) { |
|
233 | + return; |
|
234 | + } |
|
219 | 235 | $this->setSessionValues( 'errors', [], 'The Honeypot caught a bad submission:' ); |
220 | 236 | $this->error = __( 'The review submission failed. Please notify the site administrator.', 'site-reviews' ); |
221 | 237 | } |
@@ -225,7 +241,9 @@ discard block |
||
225 | 241 | */ |
226 | 242 | protected function validateRecaptcha() |
227 | 243 | { |
228 | - if( !empty( $this->error ))return; |
|
244 | + if( !empty( $this->error )) { |
|
245 | + return; |
|
246 | + } |
|
229 | 247 | $isValid = $this->isRecaptchaResponseValid(); |
230 | 248 | if( is_null( $isValid )) { |
231 | 249 | $this->setSessionValues( 'recaptcha', true ); |
@@ -10,7 +10,7 @@ |
||
10 | 10 | const EXPIRY_TIME = WEEK_IN_SECONDS; |
11 | 11 | |
12 | 12 | /** |
13 | - * @return array |
|
13 | + * @return array |
|
14 | 14 | */ |
15 | 15 | public function getCloudflareIps() |
16 | 16 | { |
@@ -19,11 +19,11 @@ discard block |
||
19 | 19 | $ipAddresses = array_fill_keys( ['v4', 'v6'], [] ); |
20 | 20 | foreach( array_keys( $ipAddresses ) as $version ) { |
21 | 21 | $response = wp_remote_get( 'https://www.cloudflare.com/ips-'.$version ); |
22 | - if( is_wp_error( $response )) { |
|
22 | + if( is_wp_error( $response ) ) { |
|
23 | 23 | glsr_log()->error( $response->get_error_message() ); |
24 | 24 | continue; |
25 | 25 | } |
26 | - $ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response ))); |
|
26 | + $ipAddresses[$version] = array_filter( explode( PHP_EOL, wp_remote_retrieve_body( $response ) ) ); |
|
27 | 27 | } |
28 | 28 | set_transient( Application::ID.'_cloudflare_ips', $ipAddresses, static::EXPIRY_TIME ); |
29 | 29 | } |
@@ -57,7 +57,7 @@ discard block |
||
57 | 57 | if( $test === false ) { |
58 | 58 | $response = wp_remote_post( 'https://api.wordpress.org/stats/php/1.0/' ); |
59 | 59 | $test = !is_wp_error( $response ) |
60 | - && in_array( $response['response']['code'], range( 200, 299 )) |
|
60 | + && in_array( $response['response']['code'], range( 200, 299 ) ) |
|
61 | 61 | ? 'Works' |
62 | 62 | : 'Does not work'; |
63 | 63 | set_transient( Application::ID.'_remote_post_test', $test, static::EXPIRY_TIME ); |
@@ -12,7 +12,7 @@ discard block |
||
12 | 12 | 'name' => 'tripadvisor', |
13 | 13 | 'title' => 'Tripadvisor Reviews', |
14 | 14 | ], |
15 | - ]); |
|
15 | + ] ); |
|
16 | 16 | $template->render( 'partials/addons/addon', [ |
17 | 17 | 'context' => [ |
18 | 18 | 'description' => __( 'Sync your Yelp reviews and display them on your site.', 'site-reviews' ), |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | 'name' => 'yelp', |
21 | 21 | 'title' => 'Yelp Reviews', |
22 | 22 | ], |
23 | - ]); |
|
23 | + ] ); |
|
24 | 24 | ?> |
25 | 25 | </div> |
26 | 26 | </div> |
@@ -3,7 +3,7 @@ |
||
3 | 3 | <p>{{ data.s1 }}</p> |
4 | 4 | <p>{{ data.p1 }}</p> |
5 | 5 | <p class="row-actions"> |
6 | - <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
6 | + <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
7 | 7 | </p> |
8 | 8 | <button type="button" class="toggle-row"> |
9 | 9 | <span class="screen-reader-text"><?= __( 'Show custom translation', 'site-reviews' ); ?></span> |
@@ -2,7 +2,7 @@ |
||
2 | 2 | <td class="glsr-string-td1 column-primary"> |
3 | 3 | <p>{{ data.s1 }}</p> |
4 | 4 | <p class="row-actions"> |
5 | - <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' );?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
5 | + <span class="delete"><a href="#{{ data.index }}" class="delete" aria-label="<?= __( 'Delete translation string', 'site-reviews' ); ?>"><?= __( 'Delete', 'site-reviews' ); ?></a></span> |
|
6 | 6 | </p> |
7 | 7 | <button type="button" class="toggle-row"> |
8 | 8 | <span class="screen-reader-text"><?= __( 'Show custom translation', 'site-reviews' ); ?></span> |
@@ -20,7 +20,7 @@ discard block |
||
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,5 +1,5 @@ |
||
1 | 1 | <?php defined( 'WPINC' ) || die; |
2 | 2 | |
3 | -include trailingslashit(__DIR__).'header.php'; |
|
4 | -include trailingslashit(__DIR__).'body.php'; |
|
5 | -include trailingslashit(__DIR__).'footer.php'; |
|
3 | +include trailingslashit( __DIR__ ).'header.php'; |
|
4 | +include trailingslashit( __DIR__ ).'body.php'; |
|
5 | +include trailingslashit( __DIR__ ).'footer.php'; |