@@ -15,16 +15,16 @@ discard block |
||
15 | 15 | cs\User; |
16 | 16 | |
17 | 17 | function get_sections_rows ($structure = null, $level = 0) { |
18 | - $L = new Prefix('blogs_'); |
|
19 | - $root = false; |
|
20 | - $module = path($L->Blogs); |
|
18 | + $L = new Prefix('blogs_'); |
|
19 | + $root = false; |
|
20 | + $module = path($L->Blogs); |
|
21 | 21 | if ($structure === null) { |
22 | - $structure = Sections::instance()->get_structure(); |
|
23 | - $structure['title'] = $L->root_section; |
|
24 | - $root = true; |
|
22 | + $structure = Sections::instance()->get_structure(); |
|
23 | + $structure['title'] = $L->root_section; |
|
24 | + $root = true; |
|
25 | 25 | } |
26 | - $content = []; |
|
27 | - $content[] = [ |
|
26 | + $content = []; |
|
27 | + $content[] = [ |
|
28 | 28 | [ |
29 | 29 | h::a( |
30 | 30 | $structure['title']. |
@@ -72,36 +72,36 @@ discard block |
||
72 | 72 | return $content; |
73 | 73 | } |
74 | 74 | function get_sections_select_section ($current = null, $structure = null, $level = 0) { |
75 | - $list = [ |
|
75 | + $list = [ |
|
76 | 76 | 'in' => [], |
77 | 77 | 'value' => [] |
78 | 78 | ]; |
79 | 79 | if ($structure === null) { |
80 | - $structure = Sections::instance()->get_structure(); |
|
81 | - $L = new Prefix('blogs_'); |
|
82 | - $list['in'][] = $L->root_section; |
|
83 | - $list['value'][] = 0; |
|
80 | + $structure = Sections::instance()->get_structure(); |
|
81 | + $L = new Prefix('blogs_'); |
|
82 | + $list['in'][] = $L->root_section; |
|
83 | + $list['value'][] = 0; |
|
84 | 84 | } else { |
85 | 85 | if ($structure['id'] == $current) { |
86 | 86 | return $list; |
87 | 87 | } |
88 | - $list['in'][] = str_repeat(' ', $level).$structure['title']; |
|
89 | - $list['value'][] = $structure['id']; |
|
88 | + $list['in'][] = str_repeat(' ', $level).$structure['title']; |
|
89 | + $list['value'][] = $structure['id']; |
|
90 | 90 | } |
91 | 91 | if (!empty($structure['sections'])) { |
92 | 92 | foreach ($structure['sections'] as $section) { |
93 | - $tmp = get_sections_select_section($current, $section, $level+1); |
|
94 | - $list['in'] = array_merge($list['in'], $tmp['in']); |
|
95 | - $list['value'] = array_merge($list['value'], $tmp['value']); |
|
93 | + $tmp = get_sections_select_section($current, $section, $level + 1); |
|
94 | + $list['in'] = array_merge($list['in'], $tmp['in']); |
|
95 | + $list['value'] = array_merge($list['value'], $tmp['value']); |
|
96 | 96 | } |
97 | 97 | } |
98 | 98 | return $list; |
99 | 99 | } |
100 | 100 | function get_posts_rows ($page = 1) { |
101 | - $Posts = Posts::instance(); |
|
102 | - $Sections = Sections::instance(); |
|
101 | + $Posts = Posts::instance(); |
|
102 | + $Sections = Sections::instance(); |
|
103 | 103 | $Config = Config::instance(); |
104 | - $L = new Prefix('blogs_'); |
|
104 | + $L = new Prefix('blogs_'); |
|
105 | 105 | $User = User::instance(); |
106 | 106 | $module = path($L->Blogs); |
107 | 107 | $page = (int)$page ?: 1; |
@@ -109,7 +109,7 @@ discard block |
||
109 | 109 | $num = $Config->module('Blogs')->posts_per_page; |
110 | 110 | $from = ($page - 1) * $num; |
111 | 111 | $cdb = DB::instance()->{$Config->module('Blogs')->db('posts')}; |
112 | - $posts = $cdb->qfas( |
|
112 | + $posts = $cdb->qfas( |
|
113 | 113 | "SELECT `id` |
114 | 114 | FROM `[prefix]blogs_posts` |
115 | 115 | ORDER BY `id` DESC |
@@ -131,7 +131,7 @@ discard block |
||
131 | 131 | ); |
132 | 132 | } |
133 | 133 | unset($section); |
134 | - $content[] = [ |
|
134 | + $content[] = [ |
|
135 | 135 | h::a( |
136 | 136 | $post['title'], |
137 | 137 | [ |
@@ -37,8 +37,7 @@ |
||
37 | 37 | 'value' => $section['title'] |
38 | 38 | ] |
39 | 39 | ). |
40 | - ($Config->core['simple_admin_mode'] ? false : |
|
41 | - h::{'label info'}('blogs_section_path'). |
|
40 | + ($Config->core['simple_admin_mode'] ? false : h::{'label info'}('blogs_section_path'). |
|
42 | 41 | h::{'input[is=cs-input-text][name=path]'}( |
43 | 42 | [ |
44 | 43 | 'value' => $section['path'] |
@@ -9,8 +9,8 @@ |
||
9 | 9 | use |
10 | 10 | cs\Singleton\Base; |
11 | 11 | /** |
12 | - * @inheritdoc |
|
13 | - */ |
|
12 | + * @inheritdoc |
|
13 | + */ |
|
14 | 14 | trait Singleton { |
15 | 15 | use Base; |
16 | 16 | } |
@@ -61,7 +61,7 @@ discard block |
||
61 | 61 | 'aliases' => &$aliases, |
62 | 62 | 'final_class' => &$next_alias |
63 | 63 | ]; |
64 | - $classes = defined('CUSTOM') ? glob(CUSTOM.'/classes/'.substr($class, 2).'_*.php') : []; |
|
64 | + $classes = defined('CUSTOM') ? glob(CUSTOM.'/classes/'.substr($class, 2).'_*.php') : []; |
|
65 | 65 | foreach ($classes as $custom_class) { |
66 | 66 | // Path to file with customized class |
67 | 67 | $custom_class = str_replace(CUSTOM.'/classes/', '', substr($custom_class, 0, -4)); |
@@ -74,7 +74,7 @@ discard block |
||
74 | 74 | 'alias' => "cs\\custom\\$_custom_class", |
75 | 75 | 'path' => $custom_class |
76 | 76 | ]; |
77 | - $next_alias = "cs\\custom\\$custom_class"; |
|
77 | + $next_alias = "cs\\custom\\$custom_class"; |
|
78 | 78 | } |
79 | 79 | modified_classes($modified_classes); |
80 | 80 | } |
@@ -20,7 +20,7 @@ discard block |
||
20 | 20 | define('DIR', __DIR__); |
21 | 21 | } |
22 | 22 | mb_internal_encoding('utf-8'); |
23 | -define('ROOT', getcwd()); //Path to site root |
|
23 | +define('ROOT', getcwd()); //Path to site root |
|
24 | 24 | $fs = json_decode(file_get_contents(DIR.'/fs.json'), true); |
25 | 25 | /** |
26 | 26 | * Special autoloader for installer |
@@ -38,10 +38,10 @@ discard block |
||
38 | 38 | * Try to load classes from different places. If not found in one place - try in another. |
39 | 39 | */ |
40 | 40 | if ( |
41 | - strlen($file = @$fs[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
41 | + strlen($file = @$fs[str_replace('//', '/', "core/classes/$namespace/$class_name.php")]) || //Core classes |
|
42 | 42 | strlen($file = @$fs[str_replace('//', '/', "core/thirdparty/$namespace/$class_name.php")]) || //Third party classes |
43 | - strlen($file = @$fs[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
44 | - strlen($file = @$fs[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
43 | + strlen($file = @$fs[str_replace('//', '/', "core/traits/$namespace/$class_name.php")]) || //Core traits |
|
44 | + strlen($file = @$fs[str_replace('//', '/', "core/engines/$namespace/$class_name.php")]) || //Core engines |
|
45 | 45 | strlen($file = @$fs[str_replace('//', '/', "components/$namespace/$class_name.php")]) //Classes in modules and plugins |
46 | 46 | ) { |
47 | 47 | require_once DIR."/fs/$file"; |
@@ -27,8 +27,8 @@ discard block |
||
27 | 27 | protected $shortname; |
28 | 28 | |
29 | 29 | protected function construct () { |
30 | - $this->module = Request::instance()->current_module; |
|
31 | - $this->shortname = Config::instance()->module('Disqus')->shortname; |
|
30 | + $this->module = Request::instance()->current_module; |
|
31 | + $this->shortname = Config::instance()->module('Disqus')->shortname; |
|
32 | 32 | } |
33 | 33 | /** |
34 | 34 | * Set module (current module assumed by default) |
@@ -36,7 +36,7 @@ discard block |
||
36 | 36 | * @param string $module Module name |
37 | 37 | */ |
38 | 38 | function set_module ($module) { |
39 | - $this->module = $module; |
|
39 | + $this->module = $module; |
|
40 | 40 | } |
41 | 41 | /** |
42 | 42 | * Count of comments for specified item |
@@ -73,11 +73,11 @@ discard block |
||
73 | 73 | return '<div id="disqus_thread"></div>'; |
74 | 74 | } |
75 | 75 | protected function count_js () { |
76 | - static $added = false; |
|
76 | + static $added = false; |
|
77 | 77 | if ($added) { |
78 | 78 | return; |
79 | 79 | } |
80 | - $added = true; |
|
80 | + $added = true; |
|
81 | 81 | Page::instance()->js( |
82 | 82 | "var disqus_shortname = '$this->shortname'; |
83 | 83 | if (!window.disqus_count_items) { window.disqus_count_items = []; }", |
@@ -85,11 +85,11 @@ discard block |
||
85 | 85 | ); |
86 | 86 | } |
87 | 87 | protected function block_js ($item) { |
88 | - static $added = false; |
|
88 | + static $added = false; |
|
89 | 89 | if ($added) { |
90 | 90 | return; |
91 | 91 | } |
92 | - $added = true; |
|
92 | + $added = true; |
|
93 | 93 | Page::instance()->js( |
94 | 94 | "var disqus_shortname = '$this->shortname', disqus_identifier = '".str_replace("'", "\'", "$this->module/$item")."';", |
95 | 95 | 'code' |
@@ -27,7 +27,7 @@ |
||
27 | 27 | public function onOpen (ConnectionInterface $conn, RequestInterface $request = null) { |
28 | 28 | $L = Language::instance(); |
29 | 29 | /** @noinspection PhpUndefinedFieldInspection */ |
30 | - $ip = $this->ip( |
|
30 | + $ip = $this->ip( |
|
31 | 31 | [ |
32 | 32 | $conn->remoteAddress, |
33 | 33 | $request->getHeader('X-Forwarded-For'), |
@@ -281,7 +281,7 @@ |
||
281 | 281 | $module_data['active'] == Config\Module_Properties::ENABLED; |
282 | 282 | } |
283 | 283 | ); |
284 | - $L = Language::instance(); |
|
284 | + $L = Language::instance(); |
|
285 | 285 | foreach ($modules as $module => &$localized_name) { |
286 | 286 | $localized_name = path($L->$module); |
287 | 287 | } |
@@ -108,7 +108,7 @@ |
||
108 | 108 | * If match was not found - mirror is not allowed! |
109 | 109 | */ |
110 | 110 | if ($this->mirror_index === -1) { |
111 | - throw new ExitException("Mirror $this->host not allowed", 400); |
|
111 | + throw new ExitException("mirror $this->host not allowed", 400); |
|
112 | 112 | } |
113 | 113 | $results = $this->analyze_route_path($this->path); |
114 | 114 | $this->handle_redirect($Config, $results['path_normalized']); |
@@ -54,8 +54,7 @@ |
||
54 | 54 | * |
55 | 55 | * @throws ExitException |
56 | 56 | */ |
57 | - function init ($server, $query, $data, $files, $data_stream, $cookie, $request_started) { |
|
58 | - ++static::$id; |
|
57 | + function init ($server, $query, $data, $files, $data_stream, $cookie, $request_started) {++static::$id; |
|
59 | 58 | $this->init_server($server); |
60 | 59 | $this->init_query($query); |
61 | 60 | $this->init_data_and_files($data, $files, $data_stream); |