@@ -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 | } |
@@ -75,7 +75,7 @@ discard block |
||
75 | 75 | } |
76 | 76 | |
77 | 77 | // get all depended category ids |
78 | - $cats = ContentCategory::where('path', 'like', $this->_record->path . '%')->get(['id'])->toArray(); |
|
78 | + $cats = ContentCategory::where('path', 'like', $this->_record->path.'%')->get(['id'])->toArray(); |
|
79 | 79 | $allCategoryIds = Arr::ploke('id', $cats); |
80 | 80 | |
81 | 81 | // update category_id in content |
@@ -110,7 +110,7 @@ discard block |
||
110 | 110 | $response = []; |
111 | 111 | foreach ($data as $key=>$val) { |
112 | 112 | if ($this->_record->id !== $key) { |
113 | - $response[] = (string)$key; |
|
113 | + $response[] = (string) $key; |
|
114 | 114 | } |
115 | 115 | } |
116 | 116 | return $response; |
@@ -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 | } |
@@ -29,8 +29,8 @@ discard block |
||
29 | 29 | $objectTemplate = null; |
30 | 30 | |
31 | 31 | if ($singleName) { |
32 | - $objectDirPath = root . '/Apps/' . $type . '/'; |
|
33 | - $objectNamespace = 'Apps\\' . $type; |
|
32 | + $objectDirPath = root.'/Apps/'.$type.'/'; |
|
33 | + $objectNamespace = 'Apps\\'.$type; |
|
34 | 34 | $objectName = ucfirst($name); |
35 | 35 | } else { |
36 | 36 | $split = explode('/', $name); |
@@ -47,46 +47,46 @@ discard block |
||
47 | 47 | } |
48 | 48 | |
49 | 49 | if ($type === 'Widget') { |
50 | - $objectDirPath = root . '/Widgets/' . $workground; |
|
51 | - $objectNamespace = 'Widgets\\' . $workground; |
|
50 | + $objectDirPath = root.'/Widgets/'.$workground; |
|
51 | + $objectNamespace = 'Widgets\\'.$workground; |
|
52 | 52 | } else { |
53 | - $objectDirPath = root . '/Apps/' . $type . '/' . $workground; |
|
54 | - $objectNamespace = 'Apps\\' . $type . '\\' . $workground; |
|
53 | + $objectDirPath = root.'/Apps/'.$type.'/'.$workground; |
|
54 | + $objectNamespace = 'Apps\\'.$type.'\\'.$workground; |
|
55 | 55 | } |
56 | 56 | |
57 | 57 | if (false !== $subName) { |
58 | - $objectDirPath .= '/' . implode('/', $subName); |
|
59 | - $objectNamespace .= '\\' . implode('\\', $subName); |
|
58 | + $objectDirPath .= '/'.implode('/', $subName); |
|
59 | + $objectNamespace .= '\\'.implode('\\', $subName); |
|
60 | 60 | } |
61 | 61 | |
62 | 62 | |
63 | 63 | // try to find workground-based controller |
64 | - if (File::exist('/Private/Carcase/' . $workground . '/' . $type . '.tphp')) { |
|
65 | - $objectTemplate = File::read('/Private/Carcase/' . $workground . '/' . $type . '.tphp'); |
|
64 | + if (File::exist('/Private/Carcase/'.$workground.'/'.$type.'.tphp')) { |
|
65 | + $objectTemplate = File::read('/Private/Carcase/'.$workground.'/'.$type.'.tphp'); |
|
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | 69 | if (!Directory::exist($objectDirPath) && !Directory::create($objectDirPath)) { |
70 | - $this->message = 'Directory could not be created: ' . $objectDirPath; |
|
70 | + $this->message = 'Directory could not be created: '.$objectDirPath; |
|
71 | 71 | return false; |
72 | 72 | } |
73 | 73 | |
74 | 74 | if ($objectTemplate === null) { |
75 | - $objectTemplate = File::read('/Private/Carcase/' . $type . '.tphp'); |
|
75 | + $objectTemplate = File::read('/Private/Carcase/'.$type.'.tphp'); |
|
76 | 76 | if (false === $objectTemplate) { |
77 | - $this->message = 'Php template file is not founded: /Private/Carcase/' . $type . '.tphp'; |
|
77 | + $this->message = 'Php template file is not founded: /Private/Carcase/'.$type.'.tphp'; |
|
78 | 78 | return false; |
79 | 79 | } |
80 | 80 | } |
81 | 81 | |
82 | 82 | $objectContent = Str::replace(['%namespace%', '%name%'], [$objectNamespace, $objectName], $objectTemplate); |
83 | - $objectFullPath = $objectDirPath . '/' . $objectName . '.php'; |
|
83 | + $objectFullPath = $objectDirPath.'/'.$objectName.'.php'; |
|
84 | 84 | if (File::exist($objectFullPath)) { |
85 | - $this->message = $type . ' is always exist: ' . $objectFullPath; |
|
85 | + $this->message = $type.' is always exist: '.$objectFullPath; |
|
86 | 86 | return false; |
87 | 87 | } |
88 | 88 | File::write($objectFullPath, $objectContent); |
89 | - $this->message = $type . ' template was created: [' . $objectName . '] in path: ' . Str::replace(root, '', $objectDirPath); |
|
89 | + $this->message = $type.' template was created: ['.$objectName.'] in path: '.Str::replace(root, '', $objectDirPath); |
|
90 | 90 | return true; |
91 | 91 | } |
92 | 92 | } |
93 | 93 | \ No newline at end of file |
@@ -10,6 +10,10 @@ |
||
10 | 10 | { |
11 | 11 | public $message; |
12 | 12 | |
13 | + /** |
|
14 | + * @param string $name |
|
15 | + * @param string $type |
|
16 | + */ |
|
13 | 17 | public function createObject($name, $type) |
14 | 18 | { |
15 | 19 | $singleName = false; |
@@ -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 |
@@ -25,6 +25,6 @@ |
||
25 | 25 | |
26 | 26 | public function actionRead($id) |
27 | 27 | { |
28 | - echo "Action read called" . $id; |
|
28 | + echo "Action read called".$id; |
|
29 | 29 | } |
30 | 30 | } |
31 | 31 | \ No newline at end of file |
@@ -3,8 +3,6 @@ |
||
3 | 3 | namespace Apps\Controller\Front; |
4 | 4 | |
5 | 5 | use Extend\Core\Arch\Controller; |
6 | -use Apps\Model\Front\User; |
|
7 | -use Ffcms\Core\App; |
|
8 | 6 | |
9 | 7 | |
10 | 8 | class Main extends Controller |
@@ -32,7 +32,7 @@ |
||
32 | 32 | $connector = new \elFinderConnector(new \elFinder([ |
33 | 33 | 'locale' => '', |
34 | 34 | 'roots' => [ |
35 | - ['driver' => 'LocalFileSystem', 'path' => root . '/upload/', 'URL' => App::$Alias->scriptUrl . '/upload/'] |
|
35 | + ['driver' => 'LocalFileSystem', 'path' => root.'/upload/', 'URL' => App::$Alias->scriptUrl.'/upload/'] |
|
36 | 36 | ] |
37 | 37 | ])); |
38 | 38 |