@@ -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 | } |
@@ -42,8 +42,8 @@ discard block |
||
42 | 42 | { |
43 | 43 | if( is_admin() )return; |
44 | 44 | $request = $this->getRequest(); |
45 | - if( !$this->isValidPostRequest( $request ))return; |
|
46 | - if( !$this->isValidPublicNonce( $request ))return; |
|
45 | + if( !$this->isValidPostRequest( $request ) )return; |
|
46 | + if( !$this->isValidPublicNonce( $request ) )return; |
|
47 | 47 | $this->routeRequest( 'public', $request['action'], $request ); |
48 | 48 | } |
49 | 49 | |
@@ -53,11 +53,11 @@ discard block |
||
53 | 53 | protected function checkAjaxNonce( array $request ) |
54 | 54 | { |
55 | 55 | if( !is_user_logged_in() )return; |
56 | - if( !isset( $request['nonce'] )) { |
|
56 | + if( !isset($request['nonce']) ) { |
|
57 | 57 | glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request ); |
58 | 58 | wp_die(); |
59 | 59 | } |
60 | - if( !wp_verify_nonce( $request['nonce'], $request['action'] )) { |
|
60 | + if( !wp_verify_nonce( $request['nonce'], $request['action'] ) ) { |
|
61 | 61 | glsr_log()->error( 'Nonce check failed for ajax request' )->info( $request ); |
62 | 62 | wp_die( -1, 403 ); |
63 | 63 | } |
@@ -68,11 +68,11 @@ discard block |
||
68 | 68 | */ |
69 | 69 | protected function checkAjaxRequest( array $request ) |
70 | 70 | { |
71 | - if( !isset( $request['action'] )) { |
|
71 | + if( !isset($request['action']) ) { |
|
72 | 72 | glsr_log()->error( 'The AJAX request must include an action' )->info( $request ); |
73 | 73 | wp_die(); |
74 | 74 | } |
75 | - if( empty( $request['ajax_request'] )) { |
|
75 | + if( empty($request['ajax_request']) ) { |
|
76 | 76 | glsr_log()->error( 'The AJAX request look invalid' )->info( $request ); |
77 | 77 | wp_die(); |
78 | 78 | } |
@@ -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 | } |
@@ -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 | } |
@@ -40,10 +42,16 @@ discard block |
||
40 | 42 | */ |
41 | 43 | public function routePublicPostRequest() |
42 | 44 | { |
43 | - if( is_admin() )return; |
|
45 | + if( is_admin() ) { |
|
46 | + return; |
|
47 | + } |
|
44 | 48 | $request = $this->getRequest(); |
45 | - if( !$this->isValidPostRequest( $request ))return; |
|
46 | - if( !$this->isValidPublicNonce( $request ))return; |
|
49 | + if( !$this->isValidPostRequest( $request )) { |
|
50 | + return; |
|
51 | + } |
|
52 | + if( !$this->isValidPublicNonce( $request )) { |
|
53 | + return; |
|
54 | + } |
|
47 | 55 | $this->routeRequest( 'public', $request['action'], $request ); |
48 | 56 | } |
49 | 57 | |
@@ -52,7 +60,9 @@ discard block |
||
52 | 60 | */ |
53 | 61 | protected function checkAjaxNonce( array $request ) |
54 | 62 | { |
55 | - if( !is_user_logged_in() )return; |
|
63 | + if( !is_user_logged_in() ) { |
|
64 | + return; |
|
65 | + } |
|
56 | 66 | if( !isset( $request['nonce'] )) { |
57 | 67 | glsr_log()->error( 'The AJAX request must include a nonce' )->info( $request ); |
58 | 68 | wp_die(); |