@@ -273,7 +273,7 @@ discard block |
||
| 273 | 273 | ); |
| 274 | 274 | $base_target_file_name = basename($base_target_file_path); |
| 275 | 275 | // Replace first script with combined file |
| 276 | - $data = str_replace( |
|
| 276 | + $data = str_replace( |
|
| 277 | 277 | $scripts_to_replace[0], |
| 278 | 278 | "<script src=\"$base_target_file_name.js?$content_md5\"></script>", |
| 279 | 279 | $data |
@@ -377,7 +377,7 @@ discard block |
||
| 377 | 377 | ); |
| 378 | 378 | $base_target_file_name = basename($base_target_file_path); |
| 379 | 379 | // Replace first link or style with combined file |
| 380 | - $data = str_replace( |
|
| 380 | + $data = str_replace( |
|
| 381 | 381 | $links_and_styles_to_replace[0], |
| 382 | 382 | "<link rel=\"import\" type=\"css\" href=\"$base_target_file_name.css?$content_md5\">", |
| 383 | 383 | $data |
@@ -101,7 +101,7 @@ |
||
| 101 | 101 | 'alias' => "cs\\custom\\$_custom_class", |
| 102 | 102 | 'path' => $custom_class |
| 103 | 103 | ]; |
| 104 | - $next_alias = "cs\\custom\\$custom_class"; |
|
| 104 | + $next_alias = "cs\\custom\\$custom_class"; |
|
| 105 | 105 | } |
| 106 | 106 | $modified_classes[$class] = [ |
| 107 | 107 | 'aliases' => $aliases, |
@@ -22,7 +22,7 @@ |
||
| 22 | 22 | if ($User->guest()) { |
| 23 | 23 | throw new ExitException(403); |
| 24 | 24 | } |
| 25 | - $fields = [ |
|
| 25 | + $fields = [ |
|
| 26 | 26 | 'id', |
| 27 | 27 | 'login', |
| 28 | 28 | 'username', |
@@ -43,7 +43,7 @@ |
||
| 43 | 43 | "public_key" : "@public_key" |
| 44 | 44 | } |
| 45 | 45 | |
| 46 | -CONFIG; |
|
| 46 | +config; |
|
| 47 | 47 | /** |
| 48 | 48 | * @param string $source |
| 49 | 49 | * @param string $target |
@@ -154,10 +154,10 @@ discard block |
||
| 154 | 154 | * Try to load classes from different places. If not found in one place - try in another. |
| 155 | 155 | */ |
| 156 | 156 | if ( |
| 157 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
| 157 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
| 158 | 158 | strlen($file = @$file_index_map[str_replace('//', '/', "core/thirdparty/$namespace/$class_name.php")]) || //Third party classes |
| 159 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
| 160 | - strlen($file = @$file_index_map[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
| 159 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
| 160 | + strlen($file = @$file_index_map[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
| 161 | 161 | strlen($file = @$file_index_map[str_replace('//', '/', "components/$namespace/$class_name.php")]) //Classes in modules and plugins |
| 162 | 162 | ) { |
| 163 | 163 | /** @noinspection UntrustedInclusionInspection */ |
@@ -279,7 +279,7 @@ discard block |
||
| 279 | 279 | * @throws Exception |
| 280 | 280 | */ |
| 281 | 281 | protected static function initialize_system_config ($cdb, $source, $site_name, $url, $admin_email, $language, $domain, $timezone, $mode) { |
| 282 | - $config = [ |
|
| 282 | + $config = [ |
|
| 283 | 283 | 'name' => $site_name, |
| 284 | 284 | 'url' => [$url], |
| 285 | 285 | 'admin_email' => $admin_email, |
@@ -177,7 +177,7 @@ discard block |
||
| 177 | 177 | php $argv[0] -i |
| 178 | 178 | php $argv[0] -sn Web-site -i |
| 179 | 179 | |
| 180 | -HELP; |
|
| 180 | +help; |
|
| 181 | 181 | return; |
| 182 | 182 | } |
| 183 | 183 | |
@@ -217,4 +217,4 @@ discard block |
||
| 217 | 217 | Login: $admin_login |
| 218 | 218 | Password: $options[admin_password] |
| 219 | 219 | |
| 220 | -SUCCESS; |
|
| 220 | +success; |
|
@@ -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); |