@@ -87,7 +87,7 @@ |
||
87 | 87 | ob_wrapper('phpinfo'), |
88 | 88 | $version |
89 | 89 | ); |
90 | - $return = "Apache $version[1]"; |
|
90 | + $return = "apache $version[1]"; |
|
91 | 91 | if (stripos($phpinfo, 'mod_php') !== false) { |
92 | 92 | $return .= ' + mod_php + PHP '.PHP_VERSION; |
93 | 93 | } |
@@ -217,7 +217,7 @@ |
||
217 | 217 | * |
218 | 218 | * @return array|false |
219 | 219 | */ |
220 | - protected static function &get_block_by_index ($index) { |
|
220 | + protected static function &get_block_by_index($index) { |
|
221 | 221 | foreach (Config::instance()->components['blocks'] as &$block) { |
222 | 222 | if ($block['index'] == $index) { |
223 | 223 | return $block; |
@@ -111,7 +111,7 @@ |
||
111 | 111 | 'value', |
112 | 112 | 'id' |
113 | 113 | ); |
114 | - $data['users'] = array_column( |
|
114 | + $data['users'] = array_column( |
|
115 | 115 | $User->db()->qfa( |
116 | 116 | [ |
117 | 117 | "SELECT |
@@ -88,7 +88,7 @@ |
||
88 | 88 | <FilesMatch "\.css$"> |
89 | 89 | Header set Content-Type text/css |
90 | 90 | </FilesMatch> |
91 | -HTACCESS |
|
91 | +htaccess |
|
92 | 92 | ); |
93 | 93 | } |
94 | 94 | foreach ($files as $file) { |
@@ -146,7 +146,7 @@ |
||
146 | 146 | Header set Content-Type application/octet-stream |
147 | 147 | </ifModule> |
148 | 148 | |
149 | -HTACCESS; |
|
149 | +htaccess; |
|
150 | 150 | if (is_dir(STORAGE.'/Composer/vendor/bower-asset')) { |
151 | 151 | file_put_contents(STORAGE.'/Composer/vendor/bower-asset/.htaccess', $htaccess_contents); |
152 | 152 | } |
@@ -25,8 +25,7 @@ |
||
25 | 25 | ). |
26 | 26 | h::label($L->gallery_title). |
27 | 27 | h::{'input[is=cs-input-text][name=add[title]]'}(). |
28 | - ($Config->core['simple_admin_mode'] ? '' : |
|
29 | - h::label(h::info('photo_gallery_gallery_path')). |
|
28 | + ($Config->core['simple_admin_mode'] ? '' : h::label(h::info('photo_gallery_gallery_path')). |
|
30 | 29 | h::{'input[is=cs-input-text][name=add[path]]'}() |
31 | 30 | ). |
32 | 31 | h::label($L->gallery_description). |
@@ -25,8 +25,7 @@ |
||
25 | 25 | ). |
26 | 26 | h::label($L->gallery_title). |
27 | 27 | h::{'input[is=cs-input-text][name=add[title]]'}(). |
28 | - ($Config->core['simple_admin_mode'] ? '' : |
|
29 | - h::label(h::info('photo_gallery_gallery_path')). |
|
28 | + ($Config->core['simple_admin_mode'] ? '' : h::label(h::info('photo_gallery_gallery_path')). |
|
30 | 29 | h::{'input[is=cs-input-text][name=add[path]]'}() |
31 | 30 | ). |
32 | 31 | h::label($L->gallery_description). |
@@ -184,40 +184,40 @@ |
||
184 | 184 | return; |
185 | 185 | } |
186 | 186 | switch ($_GET['response_type']) { |
187 | - case 'code': |
|
188 | - $Response->redirect( |
|
189 | - http_build_url( |
|
190 | - $redirect_uri, |
|
191 | - [ |
|
192 | - 'code' => $code, |
|
193 | - 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
194 | - ] |
|
195 | - ), |
|
196 | - 302 |
|
197 | - ); |
|
198 | - $Page->Content = ''; |
|
199 | - return; |
|
200 | - case 'token': |
|
201 | - $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri); |
|
202 | - if ($token_data) { |
|
203 | - unset($token_data['refresh_token']); |
|
204 | - $url = http_build_url( |
|
205 | - $redirect_uri, |
|
206 | - array_merge( |
|
207 | - $token_data, |
|
187 | + case 'code': |
|
188 | + $Response->redirect( |
|
189 | + http_build_url( |
|
190 | + $redirect_uri, |
|
208 | 191 | [ |
192 | + 'code' => $code, |
|
209 | 193 | 'state' => isset($_GET['state']) ? $_GET['state'] : false |
210 | 194 | ] |
211 | - ) |
|
195 | + ), |
|
196 | + 302 |
|
212 | 197 | ); |
213 | - $url = implode('#', explode('?', $url, 2)); |
|
214 | - $Response->redirect($url, 302); |
|
215 | 198 | $Page->Content = ''; |
216 | 199 | return; |
217 | - } else { |
|
218 | - error_redirect('server_error', "Server can't get token data, try later"); |
|
219 | - return; |
|
220 | - } |
|
221 | - default: |
|
222 | - error_redirect('unsupported_response_type', 'Specified response_type is not supported, only "token" or "code" types available'); |
|
200 | + case 'token': |
|
201 | + $token_data = $OAuth2->get_code($code, $client['id'], $client['secret'], $redirect_uri); |
|
202 | + if ($token_data) { |
|
203 | + unset($token_data['refresh_token']); |
|
204 | + $url = http_build_url( |
|
205 | + $redirect_uri, |
|
206 | + array_merge( |
|
207 | + $token_data, |
|
208 | + [ |
|
209 | + 'state' => isset($_GET['state']) ? $_GET['state'] : false |
|
210 | + ] |
|
211 | + ) |
|
212 | + ); |
|
213 | + $url = implode('#', explode('?', $url, 2)); |
|
214 | + $Response->redirect($url, 302); |
|
215 | + $Page->Content = ''; |
|
216 | + return; |
|
217 | + } else { |
|
218 | + error_redirect('server_error', "Server can't get token data, try later"); |
|
219 | + return; |
|
220 | + } |
|
221 | + default: |
|
222 | + error_redirect('unsupported_response_type', 'Specified response_type is not supported, only "token" or "code" types available'); |
|
223 | 223 | } |
@@ -18,8 +18,8 @@ |
||
18 | 18 | ->header('cache-control', 'no-store') |
19 | 19 | ->header('pragma', 'no-cache'); |
20 | 20 | /** |
21 | - * Errors processing |
|
22 | - */ |
|
21 | + * Errors processing |
|
22 | + */ |
|
23 | 23 | if (!isset($_POST['grant_type'])) { |
24 | 24 | $e = new ExitException( |
25 | 25 | [ |