@@ -120,7 +120,7 @@ |
||
| 120 | 120 | if (isset($_POST['site_url'])) { |
| 121 | 121 | $url = $_POST['site_url']; |
| 122 | 122 | } else { |
| 123 | - $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
| 123 | + $https = @$_SERVER['HTTPS'] ? $_SERVER['HTTPS'] !== 'off' : ( |
|
| 124 | 124 | @$_SERVER['REQUEST_SCHEME'] === 'https' || |
| 125 | 125 | @$_SERVER['HTTP_X_FORWARDED_PROTO'] === 'https' |
| 126 | 126 | ); |
@@ -23,7 +23,7 @@ discard block |
||
| 23 | 23 | CRUD_helpers, |
| 24 | 24 | Singleton; |
| 25 | 25 | |
| 26 | - protected $data_model = [ |
|
| 26 | + protected $data_model = [ |
|
| 27 | 27 | 'id' => 'int:0', |
| 28 | 28 | 'parent' => 'int:0', |
| 29 | 29 | 'title' => 'ml:text', |
@@ -195,7 +195,7 @@ discard block |
||
| 195 | 195 | LIMIT 1", |
| 196 | 196 | $section['parent'] |
| 197 | 197 | ) ?: $section['parent']; |
| 198 | - $update = $this->db_prime()->q( |
|
| 198 | + $update = $this->db_prime()->q( |
|
| 199 | 199 | [ |
| 200 | 200 | "UPDATE `[prefix]blogs_sections` |
| 201 | 201 | SET `parent` = '%2\$d' |
@@ -406,7 +406,7 @@ discard block |
||
| 406 | 406 | /** |
| 407 | 407 | * Narrow the dependencies to current module only |
| 408 | 408 | */ |
| 409 | - $dependencies = array_unique( |
|
| 409 | + $dependencies = array_unique( |
|
| 410 | 410 | array_merge( |
| 411 | 411 | ['System'], |
| 412 | 412 | $dependencies['System'], |
@@ -481,7 +481,7 @@ discard block |
||
| 481 | 481 | * @return string[][] |
| 482 | 482 | */ |
| 483 | 483 | protected function add_versions_hash ($includes) { |
| 484 | - $content = array_reduce( |
|
| 484 | + $content = array_reduce( |
|
| 485 | 485 | get_files_list(DIR.'/components', '/^meta\.json$/', 'f', true, true), |
| 486 | 486 | function ($content, $file) { |
| 487 | 487 | return $content.file_get_contents($file); |
@@ -511,7 +511,7 @@ discard block |
||
| 511 | 511 | ). |
| 512 | 512 | h::style($this->core_css['plain'].$this->css['plain'] ?: false); |
| 513 | 513 | /** @noinspection NestedTernaryOperatorInspection */ |
| 514 | - $scripts = |
|
| 514 | + $scripts = |
|
| 515 | 515 | array_reduce( |
| 516 | 516 | array_merge($this->core_js['path'], $this->js['path']), |
| 517 | 517 | function ($content, $src) { |
@@ -47,11 +47,11 @@ |
||
| 47 | 47 | * Try to load classes from different places. If not found in one place - try in another. |
| 48 | 48 | */ |
| 49 | 49 | if ( |
| 50 | - _require_once($file = DIR."/core/classes/$namespace/$class_name.php", false) || //Core classes |
|
| 50 | + _require_once($file = DIR."/core/classes/$namespace/$class_name.php", false) || //Core classes |
|
| 51 | 51 | _require_once($file = DIR."/core/thirdparty/$namespace/$class_name.php", false) || //Third party classes |
| 52 | - _require_once($file = DIR."/core/traits/$namespace/$class_name.php", false) || //Core traits |
|
| 53 | - _require_once($file = ENGINES."/$namespace/$class_name.php", false) || //Core engines |
|
| 54 | - _require_once($file = MODULES."/../$namespace/$class_name.php", false) || //Classes in modules |
|
| 52 | + _require_once($file = DIR."/core/traits/$namespace/$class_name.php", false) || //Core traits |
|
| 53 | + _require_once($file = ENGINES."/$namespace/$class_name.php", false) || //Core engines |
|
| 54 | + _require_once($file = MODULES."/../$namespace/$class_name.php", false) || //Classes in modules |
|
| 55 | 55 | _require_once($file = PLUGINS."/../$namespace/$class_name.php", false) //Classes in plugins |
| 56 | 56 | ) { |
| 57 | 57 | $cache[$class] = realpath($file); |
@@ -65,7 +65,7 @@ |
||
| 65 | 65 | 'storage' => 'json', |
| 66 | 66 | 'components' => 'json' |
| 67 | 67 | ]; |
| 68 | - protected $table = '[prefix]config'; |
|
| 68 | + protected $table = '[prefix]config'; |
|
| 69 | 69 | protected function cdb () { |
| 70 | 70 | return 0; |
| 71 | 71 | } |
@@ -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 | } |
@@ -92,7 +92,7 @@ |
||
| 92 | 92 | 0, |
| 93 | 93 | strpos($table_name, '"') |
| 94 | 94 | ); |
| 95 | - $update = preg_replace_callback( |
|
| 95 | + $update = preg_replace_callback( |
|
| 96 | 96 | '/"([^"]+)"/', |
| 97 | 97 | function ($matches) { |
| 98 | 98 | return "\"$matches[1]\" = EXCLUDED.\"$matches[1]\""; |