@@ -18,7 +18,7 @@ discard block |
||
18 | 18 | |
19 | 19 | defined( 'WPINC' ) || die; |
20 | 20 | |
21 | -if( !class_exists( 'GL_Plugin_Check_v3' )) { |
|
21 | +if( !class_exists( 'GL_Plugin_Check_v3' ) ) { |
|
22 | 22 | require_once __DIR__.'/activate.php'; |
23 | 23 | } |
24 | 24 | if( !(new GL_Plugin_Check_v3( __FILE__ ))->canProceed() )return; |
@@ -27,6 +27,6 @@ discard block |
||
27 | 27 | |
28 | 28 | $app = new GeminiLabs\SiteReviews\Application; |
29 | 29 | $app->make( 'Provider' )->register( $app ); |
30 | -register_activation_hook( __FILE__, array( $app, 'activate' )); |
|
31 | -register_deactivation_hook( __FILE__, array( $app, 'deactivate' )); |
|
30 | +register_activation_hook( __FILE__, array( $app, 'activate' ) ); |
|
31 | +register_deactivation_hook( __FILE__, array( $app, 'deactivate' ) ); |
|
32 | 32 | $app->init(); |
@@ -21,7 +21,9 @@ |
||
21 | 21 | if( !class_exists( 'GL_Plugin_Check_v3' )) { |
22 | 22 | require_once __DIR__.'/activate.php'; |
23 | 23 | } |
24 | -if( !(new GL_Plugin_Check_v3( __FILE__ ))->canProceed() )return; |
|
24 | +if( !(new GL_Plugin_Check_v3( __FILE__ ))->canProceed() ) { |
|
25 | + return; |
|
26 | +} |
|
25 | 27 | require_once __DIR__.'/autoload.php'; |
26 | 28 | require_once __DIR__.'/compatibility.php'; |
27 | 29 | require_once __DIR__.'/helpers.php'; |
@@ -21,7 +21,7 @@ discard block |
||
21 | 21 | $this->errors = $args['errors']; |
22 | 22 | return glsr( Builder::class )->div( wpautop( $args['message'] ), [ |
23 | 23 | 'class' => $this->getClass(), |
24 | - ]); |
|
24 | + ] ); |
|
25 | 25 | } |
26 | 26 | |
27 | 27 | /** |
@@ -29,7 +29,7 @@ discard block |
||
29 | 29 | */ |
30 | 30 | protected function getClass() |
31 | 31 | { |
32 | - $errorClass = !empty( $this->errors ) |
|
32 | + $errorClass = !empty($this->errors) |
|
33 | 33 | ? 'glsr-has-errors' |
34 | 34 | : ''; |
35 | 35 | return trim( 'glsr-form-messages '.$errorClass ); |
@@ -32,7 +32,7 @@ |
||
32 | 32 | */ |
33 | 33 | protected static function options() |
34 | 34 | { |
35 | - require_once( ABSPATH.'wp-admin/includes/translation-install.php' ); |
|
35 | + require_once(ABSPATH.'wp-admin/includes/translation-install.php'); |
|
36 | 36 | $locales = wp_get_available_translations(); |
37 | 37 | array_walk( $locales, function( &$value ) { |
38 | 38 | $value = $value['native_name']; |
@@ -16,7 +16,9 @@ discard block |
||
16 | 16 | public function routeAdminPostRequest() |
17 | 17 | { |
18 | 18 | $request = $this->getRequest(); |
19 | - if( !$this->isValidPostRequest( $request ))return; |
|
19 | + if( !$this->isValidPostRequest( $request )) { |
|
20 | + return; |
|
21 | + } |
|
20 | 22 | check_admin_referer( $request['action'] ); |
21 | 23 | $this->routeRequest( 'admin', $request['action'], $request ); |
22 | 24 | } |
@@ -38,10 +40,16 @@ discard block |
||
38 | 40 | */ |
39 | 41 | public function routePublicPostRequest() |
40 | 42 | { |
41 | - if( is_admin() )return; |
|
43 | + if( is_admin() ) { |
|
44 | + return; |
|
45 | + } |
|
42 | 46 | $request = $this->getRequest(); |
43 | - if( !$this->isValidPostRequest( $request ))return; |
|
44 | - if( !$this->isValidPublicNonce( $request ))return; |
|
47 | + if( !$this->isValidPostRequest( $request )) { |
|
48 | + return; |
|
49 | + } |
|
50 | + if( !$this->isValidPublicNonce( $request )) { |
|
51 | + return; |
|
52 | + } |
|
45 | 53 | $this->routeRequest( 'public', $request['action'], $request ); |
46 | 54 | } |
47 | 55 | |
@@ -50,7 +58,9 @@ discard block |
||
50 | 58 | */ |
51 | 59 | protected function checkAjaxNonce( array $request ) |
52 | 60 | { |
53 | - if( !is_user_logged_in() )return; |
|
61 | + if( !is_user_logged_in() ) { |
|
62 | + return; |
|
63 | + } |
|
54 | 64 | if( !isset( $request['nonce'] )) { |
55 | 65 | $this->sendAjaxError( 'The request is missing a nonce', $request ); |
56 | 66 | } |
@@ -16,7 +16,7 @@ discard block |
||
16 | 16 | public function routeAdminPostRequest() |
17 | 17 | { |
18 | 18 | $request = $this->getRequest(); |
19 | - if( !$this->isValidPostRequest( $request ))return; |
|
19 | + if( !$this->isValidPostRequest( $request ) )return; |
|
20 | 20 | check_admin_referer( $request['action'] ); |
21 | 21 | $this->routeRequest( 'admin', $request['action'], $request ); |
22 | 22 | } |
@@ -40,8 +40,8 @@ discard block |
||
40 | 40 | { |
41 | 41 | if( is_admin() )return; |
42 | 42 | $request = $this->getRequest(); |
43 | - if( !$this->isValidPostRequest( $request ))return; |
|
44 | - if( !$this->isValidPublicNonce( $request ))return; |
|
43 | + if( !$this->isValidPostRequest( $request ) )return; |
|
44 | + if( !$this->isValidPublicNonce( $request ) )return; |
|
45 | 45 | $this->routeRequest( 'public', $request['action'], $request ); |
46 | 46 | } |
47 | 47 | |
@@ -51,10 +51,10 @@ discard block |
||
51 | 51 | protected function checkAjaxNonce( array $request ) |
52 | 52 | { |
53 | 53 | if( !is_user_logged_in() )return; |
54 | - if( !isset( $request['nonce'] )) { |
|
54 | + if( !isset($request['nonce']) ) { |
|
55 | 55 | $this->sendAjaxError( 'The request is missing a nonce', $request ); |
56 | 56 | } |
57 | - if( !wp_verify_nonce( $request['nonce'], $request['action'] )) { |
|
57 | + if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) { |
|
58 | 58 | $this->sendAjaxError( 'The request failed the nonce check', $request, 403 ); |
59 | 59 | } |
60 | 60 | } |
@@ -64,10 +64,10 @@ discard block |
||
64 | 64 | */ |
65 | 65 | protected function checkAjaxRequest( array $request ) |
66 | 66 | { |
67 | - if( !isset( $request['action'] )) { |
|
67 | + if( !isset($request['action']) ) { |
|
68 | 68 | $this->sendAjaxError( 'The request must include an action', $request ); |
69 | 69 | } |
70 | - if( empty( $request['ajax_request'] )) { |
|
70 | + if( empty($request['ajax_request']) ) { |
|
71 | 71 | $this->sendAjaxError( 'The request is invalid', $request ); |
72 | 72 | } |
73 | 73 | } |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | return []; |
84 | 84 | } |
85 | 85 | $request = glsr( Helper::class )->filterInputArray( 'request' ); |
86 | - if( empty( $request )) { |
|
86 | + if( empty($request) ) { |
|
87 | 87 | $request = glsr( Helper::class )->filterInputArray( Application::ID ); |
88 | 88 | } |
89 | 89 | return $this->normalizeRequest( $request ); |
@@ -94,7 +94,7 @@ discard block |
||
94 | 94 | */ |
95 | 95 | protected function isValidPostRequest( array $request = [] ) |
96 | 96 | { |
97 | - return !empty( $request['action'] ) && empty( $request['ajax_request'] ); |
|
97 | + return !empty($request['action']) && empty($request['ajax_request']); |
|
98 | 98 | } |
99 | 99 | |
100 | 100 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | */ |
103 | 103 | protected function isValidPublicNonce( array $request ) |
104 | 104 | { |
105 | - if( is_user_logged_in() && !wp_verify_nonce( $request['nonce'], $request['action'] )) { |
|
105 | + if( is_user_logged_in() && !wp_verify_nonce( $request['nonce'], $request['action'] ) ) { |
|
106 | 106 | glsr_log()->error( 'Nonce check failed for public request' )->info( $request ); |
107 | 107 | return false; |
108 | 108 | } |
@@ -131,11 +131,11 @@ discard block |
||
131 | 131 | protected function routeRequest( $type, $action, array $request = [] ) |
132 | 132 | { |
133 | 133 | $actionHook = 'site-reviews/route/'.$type.'/request'; |
134 | - $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' )); |
|
134 | + $controller = glsr( glsr( Helper::class )->buildClassName( $type.'-controller', 'Controllers' ) ); |
|
135 | 135 | $method = glsr( Helper::class )->buildMethodName( $action, 'router' ); |
136 | 136 | $request = apply_filters( 'site-reviews/route/request', $request, $action, $type ); |
137 | 137 | do_action( $actionHook, $action, $request ); |
138 | - if( is_callable( [$controller, $method] )) { |
|
138 | + if( is_callable( [$controller, $method] ) ) { |
|
139 | 139 | call_user_func( [$controller, $method], $request ); |
140 | 140 | return; |
141 | 141 | } |
@@ -152,7 +152,7 @@ discard block |
||
152 | 152 | protected function sendAjaxError( $error, array $request, $statusCode = 400 ) |
153 | 153 | { |
154 | 154 | glsr_log()->error( $error )->info( $request ); |
155 | - wp_send_json_error([ |
|
155 | + wp_send_json_error( [ |
|
156 | 156 | 'message' => __( 'The form could not be submitted. Please notify the site administrator.', 'site-reviews' ), |
157 | 157 | 'error' => $error, |
158 | 158 | ], $statusCode ); |
@@ -9,5 +9,5 @@ |
||
9 | 9 | */ |
10 | 10 | add_filter( 'sbp_exclude_defer_scripts', function( $scriptHandles ) { |
11 | 11 | $scriptHandles[] = 'site-reviews/google-recaptcha'; |
12 | - return array_keys( array_flip( $scriptHandles )); |
|
12 | + return array_keys( array_flip( $scriptHandles ) ); |
|
13 | 13 | }); |
@@ -22,7 +22,7 @@ discard block |
||
22 | 22 | */ |
23 | 23 | public function routerChangeReviewStatus( array $request ) |
24 | 24 | { |
25 | - wp_send_json_success( $this->execute( new ChangeStatus( $request ))); |
|
25 | + wp_send_json_success( $this->execute( new ChangeStatus( $request ) ) ); |
|
26 | 26 | } |
27 | 27 | |
28 | 28 | /** |
@@ -31,10 +31,10 @@ discard block |
||
31 | 31 | public function routerClearConsole() |
32 | 32 | { |
33 | 33 | glsr( AdminController::class )->routerClearConsole(); |
34 | - wp_send_json_success([ |
|
34 | + wp_send_json_success( [ |
|
35 | 35 | 'console' => glsr( Console::class )->get(), |
36 | 36 | 'notices' => glsr( Notice::class )->get(), |
37 | - ]); |
|
37 | + ] ); |
|
38 | 38 | } |
39 | 39 | |
40 | 40 | /** |
@@ -44,9 +44,9 @@ discard block |
||
44 | 44 | { |
45 | 45 | $shortcode = $request['shortcode']; |
46 | 46 | $response = false; |
47 | - if( array_key_exists( $shortcode, glsr()->mceShortcodes )) { |
|
47 | + if( array_key_exists( $shortcode, glsr()->mceShortcodes ) ) { |
|
48 | 48 | $data = glsr()->mceShortcodes[$shortcode]; |
49 | - if( !empty( $data['errors'] )) { |
|
49 | + if( !empty($data['errors']) ) { |
|
50 | 50 | $data['btn_okay'] = [esc_html__( 'Okay', 'site-reviews' )]; |
51 | 51 | } |
52 | 52 | $response = [ |
@@ -66,10 +66,10 @@ discard block |
||
66 | 66 | public function routerSearchPosts( array $request ) |
67 | 67 | { |
68 | 68 | $results = glsr( Database::class )->searchPosts( $request['search'] ); |
69 | - wp_send_json_success([ |
|
69 | + wp_send_json_success( [ |
|
70 | 70 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
71 | 71 | 'items' => $results, |
72 | - ]); |
|
72 | + ] ); |
|
73 | 73 | } |
74 | 74 | |
75 | 75 | /** |
@@ -77,7 +77,7 @@ discard block |
||
77 | 77 | */ |
78 | 78 | public function routerSearchTranslations( array $request ) |
79 | 79 | { |
80 | - if( empty( $request['exclude'] )) { |
|
80 | + if( empty($request['exclude']) ) { |
|
81 | 81 | $request['exclude'] = []; |
82 | 82 | } |
83 | 83 | $results = glsr( Translator::class ) |
@@ -85,10 +85,10 @@ discard block |
||
85 | 85 | ->exclude() |
86 | 86 | ->exclude( $request['exclude'] ) |
87 | 87 | ->renderResults(); |
88 | - wp_send_json_success([ |
|
88 | + wp_send_json_success( [ |
|
89 | 89 | 'empty' => '<div>'.__( 'Nothing found.', 'site-reviews' ).'</div>', |
90 | 90 | 'items' => $results, |
91 | - ]); |
|
91 | + ] ); |
|
92 | 92 | } |
93 | 93 | |
94 | 94 | /** |
@@ -102,7 +102,7 @@ discard block |
||
102 | 102 | 'message' => glsr( Session::class )->get( $request['form_id'].'message', '', true ), |
103 | 103 | 'recaptcha' => glsr( Session::class )->get( $request['form_id'].'recaptcha', false, true ), |
104 | 104 | ]; |
105 | - if( !wp_validate_boolean( $data['errors'] )) { |
|
105 | + if( !wp_validate_boolean( $data['errors'] ) ) { |
|
106 | 106 | wp_send_json_success( $data ); |
107 | 107 | } |
108 | 108 | wp_send_json_error( $data ); |
@@ -113,10 +113,10 @@ discard block |
||
113 | 113 | */ |
114 | 114 | public function routerTogglePinned( array $request ) |
115 | 115 | { |
116 | - $isPinned = $this->execute( new TogglePinned( $request )); |
|
117 | - wp_send_json_success([ |
|
116 | + $isPinned = $this->execute( new TogglePinned( $request ) ); |
|
117 | + wp_send_json_success( [ |
|
118 | 118 | 'notices' => glsr( Notice::class )->get(), |
119 | 119 | 'pinned' => $isPinned, |
120 | - ]); |
|
120 | + ] ); |
|
121 | 121 | } |
122 | 122 | } |