@@ -52,7 +52,7 @@ |
||
52 | 52 | public function save() |
53 | 53 | { |
54 | 54 | // check if target is myself or always exist in block list |
55 | - if ($this->_user->getId() === (int)$this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
55 | + if ($this->_user->getId() === (int) $this->id || Blacklist::have($this->_user->getId(), $this->id)) { |
|
56 | 56 | return false; |
57 | 57 | } |
58 | 58 |
@@ -1,6 +1,6 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | -return array ( |
|
3 | +return array( |
|
4 | 4 | 0 => 'global/write', |
5 | 5 | 1 => 'global/modify', |
6 | 6 | 2 => 'global/file', |
@@ -1,69 +1,69 @@ |
||
1 | 1 | <?php |
2 | 2 | |
3 | 3 | return array ( |
4 | - 0 => 'global/write', |
|
5 | - 1 => 'global/modify', |
|
6 | - 2 => 'global/file', |
|
7 | - 3 => 'global/all', |
|
8 | - 4 => 'Admin/Application/Index', |
|
9 | - 5 => 'Admin/Application/Install', |
|
10 | - 6 => 'Admin/Application/Update', |
|
11 | - 7 => 'Admin/Application/Turn', |
|
12 | - 8 => 'Admin/Comments/Index', |
|
13 | - 9 => 'Admin/Comments/Read', |
|
14 | - 10 => 'Admin/Comments/Edit', |
|
15 | - 11 => 'Admin/Comments/Delete', |
|
16 | - 12 => 'Admin/Comments/Publish', |
|
17 | - 13 => 'Admin/Comments/Answerlist', |
|
18 | - 14 => 'Admin/Comments/Settings', |
|
19 | - 15 => 'Admin/Content/Index', |
|
20 | - 16 => 'Admin/Content/Update', |
|
21 | - 17 => 'Admin/Content/Delete', |
|
22 | - 18 => 'Admin/Content/Restore', |
|
23 | - 19 => 'Admin/Content/Clear', |
|
24 | - 20 => 'Admin/Content/Categories', |
|
25 | - 21 => 'Admin/Content/Categorydelete', |
|
26 | - 22 => 'Admin/Content/Categoryupdate', |
|
27 | - 23 => 'Admin/Content/Globdelete', |
|
28 | - 24 => 'Admin/Content/Publish', |
|
29 | - 25 => 'Admin/Content/Settings', |
|
30 | - 26 => 'Admin/Contenttag/Index', |
|
31 | - 27 => 'Admin/Feedback/Index', |
|
32 | - 28 => 'Admin/Feedback/Read', |
|
33 | - 29 => 'Admin/Feedback/Update', |
|
34 | - 30 => 'Admin/Feedback/Turn', |
|
35 | - 31 => 'Admin/Feedback/Delete', |
|
36 | - 32 => 'Admin/Feedback/Settings', |
|
37 | - 33 => 'Admin/Main/Index', |
|
38 | - 34 => 'Admin/Main/Settings', |
|
39 | - 35 => 'Admin/Main/Files', |
|
40 | - 36 => 'Admin/Main/Antivirus', |
|
41 | - 37 => 'Admin/Main/Debugcookie', |
|
42 | - 38 => 'Admin/Main/Routing', |
|
43 | - 39 => 'Admin/Main/Addroute', |
|
44 | - 40 => 'Admin/Main/Deleteroute', |
|
45 | - 41 => 'Admin/Main/Cache', |
|
46 | - 42 => 'Admin/Main/Sessions', |
|
47 | - 43 => 'Admin/Newcomment/Index', |
|
48 | - 44 => 'Admin/Newcontent/Index', |
|
49 | - 45 => 'Admin/Profile/Index', |
|
50 | - 46 => 'Admin/Profile/Delete', |
|
51 | - 47 => 'Admin/Profile/Update', |
|
52 | - 48 => 'Admin/Profile/Fieldlist', |
|
53 | - 49 => 'Admin/Profile/Fieldupdate', |
|
54 | - 50 => 'Admin/Profile/Fielddelete', |
|
55 | - 51 => 'Admin/Profile/Settings', |
|
56 | - 52 => 'Admin/Search/Index', |
|
57 | - 53 => 'Admin/Sitemap/Index', |
|
58 | - 54 => 'Admin/User/Index', |
|
59 | - 55 => 'Admin/User/Update', |
|
60 | - 56 => 'Admin/User/Delete', |
|
61 | - 57 => 'Admin/User/Grouplist', |
|
62 | - 58 => 'Admin/User/GroupUpdate', |
|
63 | - 59 => 'Admin/User/Settings', |
|
64 | - 60 => 'Admin/User/Invite', |
|
65 | - 61 => 'Admin/Widget/Index', |
|
66 | - 62 => 'Admin/Widget/Install', |
|
67 | - 63 => 'Admin/Widget/Update', |
|
68 | - 64 => 'Admin/Widget/Turn', |
|
4 | + 0 => 'global/write', |
|
5 | + 1 => 'global/modify', |
|
6 | + 2 => 'global/file', |
|
7 | + 3 => 'global/all', |
|
8 | + 4 => 'Admin/Application/Index', |
|
9 | + 5 => 'Admin/Application/Install', |
|
10 | + 6 => 'Admin/Application/Update', |
|
11 | + 7 => 'Admin/Application/Turn', |
|
12 | + 8 => 'Admin/Comments/Index', |
|
13 | + 9 => 'Admin/Comments/Read', |
|
14 | + 10 => 'Admin/Comments/Edit', |
|
15 | + 11 => 'Admin/Comments/Delete', |
|
16 | + 12 => 'Admin/Comments/Publish', |
|
17 | + 13 => 'Admin/Comments/Answerlist', |
|
18 | + 14 => 'Admin/Comments/Settings', |
|
19 | + 15 => 'Admin/Content/Index', |
|
20 | + 16 => 'Admin/Content/Update', |
|
21 | + 17 => 'Admin/Content/Delete', |
|
22 | + 18 => 'Admin/Content/Restore', |
|
23 | + 19 => 'Admin/Content/Clear', |
|
24 | + 20 => 'Admin/Content/Categories', |
|
25 | + 21 => 'Admin/Content/Categorydelete', |
|
26 | + 22 => 'Admin/Content/Categoryupdate', |
|
27 | + 23 => 'Admin/Content/Globdelete', |
|
28 | + 24 => 'Admin/Content/Publish', |
|
29 | + 25 => 'Admin/Content/Settings', |
|
30 | + 26 => 'Admin/Contenttag/Index', |
|
31 | + 27 => 'Admin/Feedback/Index', |
|
32 | + 28 => 'Admin/Feedback/Read', |
|
33 | + 29 => 'Admin/Feedback/Update', |
|
34 | + 30 => 'Admin/Feedback/Turn', |
|
35 | + 31 => 'Admin/Feedback/Delete', |
|
36 | + 32 => 'Admin/Feedback/Settings', |
|
37 | + 33 => 'Admin/Main/Index', |
|
38 | + 34 => 'Admin/Main/Settings', |
|
39 | + 35 => 'Admin/Main/Files', |
|
40 | + 36 => 'Admin/Main/Antivirus', |
|
41 | + 37 => 'Admin/Main/Debugcookie', |
|
42 | + 38 => 'Admin/Main/Routing', |
|
43 | + 39 => 'Admin/Main/Addroute', |
|
44 | + 40 => 'Admin/Main/Deleteroute', |
|
45 | + 41 => 'Admin/Main/Cache', |
|
46 | + 42 => 'Admin/Main/Sessions', |
|
47 | + 43 => 'Admin/Newcomment/Index', |
|
48 | + 44 => 'Admin/Newcontent/Index', |
|
49 | + 45 => 'Admin/Profile/Index', |
|
50 | + 46 => 'Admin/Profile/Delete', |
|
51 | + 47 => 'Admin/Profile/Update', |
|
52 | + 48 => 'Admin/Profile/Fieldlist', |
|
53 | + 49 => 'Admin/Profile/Fieldupdate', |
|
54 | + 50 => 'Admin/Profile/Fielddelete', |
|
55 | + 51 => 'Admin/Profile/Settings', |
|
56 | + 52 => 'Admin/Search/Index', |
|
57 | + 53 => 'Admin/Sitemap/Index', |
|
58 | + 54 => 'Admin/User/Index', |
|
59 | + 55 => 'Admin/User/Update', |
|
60 | + 56 => 'Admin/User/Delete', |
|
61 | + 57 => 'Admin/User/Grouplist', |
|
62 | + 58 => 'Admin/User/GroupUpdate', |
|
63 | + 59 => 'Admin/User/Settings', |
|
64 | + 60 => 'Admin/User/Invite', |
|
65 | + 61 => 'Admin/Widget/Index', |
|
66 | + 62 => 'Admin/Widget/Install', |
|
67 | + 63 => 'Admin/Widget/Update', |
|
68 | + 64 => 'Admin/Widget/Turn', |
|
69 | 69 | ); |
70 | 70 | \ No newline at end of file |
@@ -20,8 +20,8 @@ |
||
20 | 20 | public $chmodCheck = []; |
21 | 21 | |
22 | 22 | /** |
23 | - * Get default server information and prepare chmod info |
|
24 | - */ |
|
23 | + * Get default server information and prepare chmod info |
|
24 | + */ |
|
25 | 25 | public function before() |
26 | 26 | { |
27 | 27 | $this->phpVersion = phpversion(); |
@@ -33,7 +33,7 @@ |
||
33 | 33 | public function before() |
34 | 34 | { |
35 | 35 | // get full name of update object |
36 | - $class = 'Apps\Controller\Admin\\' . $this->_record->sys_name; |
|
36 | + $class = 'Apps\Controller\Admin\\'.$this->_record->sys_name; |
|
37 | 37 | if (class_exists($class)) { |
38 | 38 | $this->_callback = $class; |
39 | 39 | } else { |
@@ -62,8 +62,8 @@ |
||
62 | 62 | ]; |
63 | 63 | |
64 | 64 | foreach (App::$Properties->get('languages') as $lang) { |
65 | - $rules[] = ['name.' . $lang, 'required']; |
|
66 | - $rules[] = ['name.' . $lang, 'length_max', 50]; |
|
65 | + $rules[] = ['name.'.$lang, 'required']; |
|
66 | + $rules[] = ['name.'.$lang, 'length_max', 50]; |
|
67 | 67 | } |
68 | 68 | |
69 | 69 | return $rules; |
@@ -58,7 +58,7 @@ |
||
58 | 58 | $configData = [ |
59 | 59 | ucfirst(Str::lowerCase($this->type)) => [ |
60 | 60 | ucfirst(Str::lowerCase($this->loader)) => [ |
61 | - '/' . trim($this->source, '/') => '/' . trim($this->target, '/') |
|
61 | + '/'.trim($this->source, '/') => '/'.trim($this->target, '/') |
|
62 | 62 | ] |
63 | 63 | ] |
64 | 64 | ]; |
@@ -48,7 +48,7 @@ |
||
48 | 48 | |
49 | 49 | // prepare source path |
50 | 50 | if ($this->type === 'Alias') { |
51 | - $this->source = '/' . trim($this->source, '/'); |
|
51 | + $this->source = '/'.trim($this->source, '/'); |
|
52 | 52 | } else { |
53 | 53 | $this->source = ucfirst($this->source); |
54 | 54 | } |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | public function copyFile(iUser $user) |
48 | 48 | { |
49 | 49 | // move file to original folder |
50 | - $upload = $this->file->move(root . '/upload/user/avatar/original/', $user->id . '.' . $this->file->guessExtension()); |
|
50 | + $upload = $this->file->move(root.'/upload/user/avatar/original/', $user->id.'.'.$this->file->guessExtension()); |
|
51 | 51 | |
52 | 52 | try { |
53 | 53 | // big image |
@@ -82,11 +82,11 @@ discard block |
||
82 | 82 | } |
83 | 83 | |
84 | 84 | $image = new Image(); |
85 | - $image->setCacheDir(root . '/Private/Cache/images'); |
|
85 | + $image->setCacheDir(root.'/Private/Cache/images'); |
|
86 | 86 | |
87 | 87 | $image->open($original->getPathname()) |
88 | 88 | ->cropResize($sizeConvert[$size][0], $sizeConvert[$size][1]) |
89 | - ->save(root . '/upload/user/avatar/' . $size . '/' . $user_id . '.jpg', 'jpg', static::COMPRESS_QUALITY); |
|
89 | + ->save(root.'/upload/user/avatar/'.$size.'/'.$user_id.'.jpg', 'jpg', static::COMPRESS_QUALITY); |
|
90 | 90 | |
91 | 91 | return null; |
92 | 92 | } |
@@ -33,7 +33,7 @@ discard block |
||
33 | 33 | $this->beginTime = time(); |
34 | 34 | |
35 | 35 | $this->signatures = new \DOMDocument(); |
36 | - $this->signatures->load(root . '/Private/Antivirus/Signatures.xml'); |
|
36 | + $this->signatures->load(root.'/Private/Antivirus/Signatures.xml'); |
|
37 | 37 | |
38 | 38 | // list of files is not prepared, 1st iteration |
39 | 39 | if (!File::exist('/Private/Antivirus/ScanFiles.json')) { |
@@ -46,7 +46,7 @@ discard block |
||
46 | 46 | |
47 | 47 | $this->scanFiles = json_decode(File::read('/Private/Antivirus/ScanFiles.json')); |
48 | 48 | if (File::exist('/Private/Antivirus/Infected.json')) { |
49 | - $this->infected = (array)json_decode(File::read('/Private/Antivirus/Infected.json')); |
|
49 | + $this->infected = (array) json_decode(File::read('/Private/Antivirus/Infected.json')); |
|
50 | 50 | } |
51 | 51 | } |
52 | 52 | |
@@ -108,13 +108,13 @@ discard block |
||
108 | 108 | |
109 | 109 | switch ($attrFormat) { |
110 | 110 | case 're': |
111 | - if ((preg_match('#(' . $sigContent . ')#smi', $content, $found, PREG_OFFSET_CAPTURE)) || |
|
112 | - (preg_match('#(' . $sigContent . ')#smi', $normalized, $found, PREG_OFFSET_CAPTURE)) |
|
111 | + if ((preg_match('#('.$sigContent.')#smi', $content, $found, PREG_OFFSET_CAPTURE)) || |
|
112 | + (preg_match('#('.$sigContent.')#smi', $normalized, $found, PREG_OFFSET_CAPTURE)) |
|
113 | 113 | ) { |
114 | 114 | $detected = true; |
115 | 115 | $pos = $found[0][1]; |
116 | 116 | $this->infected[$path][] = [ |
117 | - 'pos' => (int)$pos, |
|
117 | + 'pos' => (int) $pos, |
|
118 | 118 | 'sigId' => $attrId, |
119 | 119 | 'sigRule' => $sigContent, |
120 | 120 | 'sever' => $attrSever, |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | (($pos = strpos($normalized, $sigContent)) !== false) |
129 | 129 | ) { |
130 | 130 | $this->infected[$path][] = [ |
131 | - 'pos' => (int)$pos, |
|
131 | + 'pos' => (int) $pos, |
|
132 | 132 | 'sigId' => $attrId, |
133 | 133 | 'sigRule' => $sigContent, |
134 | 134 | 'sever' => $attrSever, |
@@ -148,7 +148,7 @@ discard block |
||
148 | 148 | */ |
149 | 149 | private function prepareScanlist() |
150 | 150 | { |
151 | - $files = (object)File::listFiles(root, $this->affectedExt); |
|
151 | + $files = (object) File::listFiles(root, $this->affectedExt); |
|
152 | 152 | File::write('/Private/Antivirus/ScanFiles.json', json_encode($files)); |
153 | 153 | } |
154 | 154 |