@@ -7,7 +7,7 @@ discard block |
||
7 | 7 | <div id="emptycontent" class="hidden"> |
8 | 8 | <div class="icon-external"></div> |
9 | 9 | <h2><?php p($l->t('No external storage configured')); ?></h2> |
10 | - <p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external' )); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p> |
|
10 | + <p><a href="<?php p(link_to('', 'index.php/settings/personal#files_external')); ?>"><?php p($l->t('You can add external storages in the personal settings')); ?></a></p> |
|
11 | 11 | </div> |
12 | 12 | |
13 | 13 | <input type="hidden" name="dir" value="" id="dir"> |
@@ -17,7 +17,7 @@ discard block |
||
17 | 17 | <tr> |
18 | 18 | <th id='headerName' class="hidden column-name"> |
19 | 19 | <div id="headerName-container"> |
20 | - <a class="name sort columntitle" data-sort="name"><span><?php p($l->t( 'Name' )); ?></span><span class="sort-indicator"></span></a> |
|
20 | + <a class="name sort columntitle" data-sort="name"><span><?php p($l->t('Name')); ?></span><span class="sort-indicator"></span></a> |
|
21 | 21 | </div> |
22 | 22 | </th> |
23 | 23 | <th id="headerBackend" class="hidden column-backend"> |
@@ -30,13 +30,13 @@ |
||
30 | 30 | $limit = null; |
31 | 31 | $offset = null; |
32 | 32 | if (isset($_GET['pattern'])) { |
33 | - $pattern = (string)$_GET['pattern']; |
|
33 | + $pattern = (string) $_GET['pattern']; |
|
34 | 34 | } |
35 | 35 | if (isset($_GET['limit'])) { |
36 | - $limit = (int)$_GET['limit']; |
|
36 | + $limit = (int) $_GET['limit']; |
|
37 | 37 | } |
38 | 38 | if (isset($_GET['offset'])) { |
39 | - $offset = (int)$_GET['offset']; |
|
39 | + $offset = (int) $_GET['offset']; |
|
40 | 40 | } |
41 | 41 | |
42 | 42 | $groups = []; |
@@ -114,7 +114,7 @@ discard block |
||
114 | 114 | |
115 | 115 | $result = []; |
116 | 116 | foreach ($storagesByMountpoint as $storageList) { |
117 | - $storage = array_reduce($storageList, function ($carry, $item) { |
|
117 | + $storage = array_reduce($storageList, function($carry, $item) { |
|
118 | 118 | if (isset($carry)) { |
119 | 119 | $carryPriorityType = $this->getPriorityType($carry); |
120 | 120 | $itemPriorityType = $this->getPriorityType($item); |
@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | $groupIds = $this->groupManager->getUserGroupIds($this->getUser()); |
187 | 187 | $mounts = $this->dbConfig->getMountsForUser($this->getUser()->getUID(), $groupIds); |
188 | 188 | $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
189 | - $configs = array_filter($configs, function ($config) { |
|
189 | + $configs = array_filter($configs, function($config) { |
|
190 | 190 | return $config instanceof StorageConfig; |
191 | 191 | }); |
192 | 192 | |
193 | - $keys = array_map(function (StorageConfig $config) { |
|
193 | + $keys = array_map(function(StorageConfig $config) { |
|
194 | 194 | return $config->getId(); |
195 | 195 | }, $configs); |
196 | 196 |
@@ -172,11 +172,11 @@ |
||
172 | 172 | public function getStorageForAllUsers() { |
173 | 173 | $mounts = $this->dbConfig->getAllMounts(); |
174 | 174 | $configs = array_map([$this, 'getStorageConfigFromDBMount'], $mounts); |
175 | - $configs = array_filter($configs, function ($config) { |
|
175 | + $configs = array_filter($configs, function($config) { |
|
176 | 176 | return $config instanceof StorageConfig; |
177 | 177 | }); |
178 | 178 | |
179 | - $keys = array_map(function (StorageConfig $config) { |
|
179 | + $keys = array_map(function(StorageConfig $config) { |
|
180 | 180 | return $config->getId(); |
181 | 181 | }, $configs); |
182 | 182 |
@@ -178,7 +178,7 @@ discard block |
||
178 | 178 | */ |
179 | 179 | public function getAdminMountsForMultiple($type, array $values) { |
180 | 180 | $builder = $this->connection->getQueryBuilder(); |
181 | - $params = array_map(function ($value) use ($builder) { |
|
181 | + $params = array_map(function($value) use ($builder) { |
|
182 | 182 | return $builder->createNamedParameter($value, IQueryBuilder::PARAM_STR); |
183 | 183 | }, $values); |
184 | 184 | |
@@ -231,7 +231,7 @@ discard block |
||
231 | 231 | 'type' => $builder->createNamedParameter($type, IQueryBuilder::PARAM_INT) |
232 | 232 | ]); |
233 | 233 | $query->execute(); |
234 | - return (int)$this->connection->lastInsertId('*PREFIX*external_mounts'); |
|
234 | + return (int) $this->connection->lastInsertId('*PREFIX*external_mounts'); |
|
235 | 235 | } |
236 | 236 | |
237 | 237 | /** |
@@ -367,7 +367,7 @@ discard block |
||
367 | 367 | } |
368 | 368 | $uniqueMounts = array_values($uniqueMounts); |
369 | 369 | |
370 | - $mountIds = array_map(function ($mount) { |
|
370 | + $mountIds = array_map(function($mount) { |
|
371 | 371 | return $mount['mount_id']; |
372 | 372 | }, $uniqueMounts); |
373 | 373 | $mountIds = array_values(array_unique($mountIds)); |
@@ -376,9 +376,9 @@ discard block |
||
376 | 376 | $config = $this->getConfigForMounts($mountIds); |
377 | 377 | $options = $this->getOptionsForMounts($mountIds); |
378 | 378 | |
379 | - return array_map(function ($mount, $applicable, $config, $options) { |
|
380 | - $mount['type'] = (int)$mount['type']; |
|
381 | - $mount['priority'] = (int)$mount['priority']; |
|
379 | + return array_map(function($mount, $applicable, $config, $options) { |
|
380 | + $mount['type'] = (int) $mount['type']; |
|
381 | + $mount['priority'] = (int) $mount['priority']; |
|
382 | 382 | $mount['applicable'] = $applicable; |
383 | 383 | $mount['config'] = $config; |
384 | 384 | $mount['options'] = $options; |
@@ -400,7 +400,7 @@ discard block |
||
400 | 400 | } |
401 | 401 | $builder = $this->connection->getQueryBuilder(); |
402 | 402 | $fields[] = 'mount_id'; |
403 | - $placeHolders = array_map(function ($id) use ($builder) { |
|
403 | + $placeHolders = array_map(function($id) use ($builder) { |
|
404 | 404 | return $builder->createPositionalParameter($id, IQueryBuilder::PARAM_INT); |
405 | 405 | }, $mountIds); |
406 | 406 | $query = $builder->select($fields) |
@@ -414,7 +414,7 @@ discard block |
||
414 | 414 | } |
415 | 415 | foreach ($rows as $row) { |
416 | 416 | if (isset($row['type'])) { |
417 | - $row['type'] = (int)$row['type']; |
|
417 | + $row['type'] = (int) $row['type']; |
|
418 | 418 | } |
419 | 419 | $result[$row['mount_id']][] = $row; |
420 | 420 | } |
@@ -445,8 +445,8 @@ discard block |
||
445 | 445 | public function getOptionsForMounts($mountIds) { |
446 | 446 | $mountOptions = $this->selectForMounts('external_options', ['key', 'value'], $mountIds); |
447 | 447 | $optionsMap = array_map([$this, 'createKeyValueMap'], $mountOptions); |
448 | - return array_map(function (array $options) { |
|
449 | - return array_map(function ($option) { |
|
448 | + return array_map(function(array $options) { |
|
449 | + return array_map(function($option) { |
|
450 | 450 | return json_decode($option); |
451 | 451 | }, $options); |
452 | 452 | }, $optionsMap); |
@@ -457,16 +457,16 @@ discard block |
||
457 | 457 | * @return array ['key1' => $value1, ...] |
458 | 458 | */ |
459 | 459 | private function createKeyValueMap(array $keyValuePairs) { |
460 | - $decryptedPairts = array_map(function ($pair) { |
|
460 | + $decryptedPairts = array_map(function($pair) { |
|
461 | 461 | if ($pair['key'] === 'password') { |
462 | 462 | $pair['value'] = $this->decryptValue($pair['value']); |
463 | 463 | } |
464 | 464 | return $pair; |
465 | 465 | }, $keyValuePairs); |
466 | - $keys = array_map(function ($pair) { |
|
466 | + $keys = array_map(function($pair) { |
|
467 | 467 | return $pair['key']; |
468 | 468 | }, $decryptedPairts); |
469 | - $values = array_map(function ($pair) { |
|
469 | + $values = array_map(function($pair) { |
|
470 | 470 | return $pair['value']; |
471 | 471 | }, $decryptedPairts); |
472 | 472 |
@@ -103,7 +103,7 @@ discard block |
||
103 | 103 | try { |
104 | 104 | $mount = $this->globalService->getStorage($mountId); |
105 | 105 | } catch (NotFoundException $e) { |
106 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts</error>'); |
|
106 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts</error>'); |
|
107 | 107 | return 404; |
108 | 108 | } |
109 | 109 | |
@@ -123,13 +123,13 @@ discard block |
||
123 | 123 | if ((count($addUsers) + count($removeUsers) + count($addGroups) + count($removeGroups) > 0) || $input->getOption('remove-all')) { |
124 | 124 | foreach ($addUsers as $addUser) { |
125 | 125 | if (!$this->userManager->userExists($addUser)) { |
126 | - $output->writeln('<error>User "' . $addUser . '" not found</error>'); |
|
126 | + $output->writeln('<error>User "'.$addUser.'" not found</error>'); |
|
127 | 127 | return 404; |
128 | 128 | } |
129 | 129 | } |
130 | 130 | foreach ($addGroups as $addGroup) { |
131 | 131 | if (!$this->groupManager->groupExists($addGroup)) { |
132 | - $output->writeln('<error>Group "' . $addGroup . '" not found</error>'); |
|
132 | + $output->writeln('<error>Group "'.$addGroup.'" not found</error>'); |
|
133 | 133 | return 404; |
134 | 134 | } |
135 | 135 | } |
@@ -156,11 +156,11 @@ discard block |
||
156 | 156 | } |
157 | 157 | |
158 | 158 | if ($outputType === self::OUTPUT_FORMAT_JSON || $outputType === self::OUTPUT_FORMAT_JSON_PRETTY) { |
159 | - $keys = array_map(function ($header) { |
|
159 | + $keys = array_map(function($header) { |
|
160 | 160 | return strtolower(str_replace(' ', '_', $header)); |
161 | 161 | }, $headers); |
162 | 162 | |
163 | - $pairs = array_map(function (StorageConfig $config) use ($keys, $userId) { |
|
163 | + $pairs = array_map(function(StorageConfig $config) use ($keys, $userId) { |
|
164 | 164 | $values = [ |
165 | 165 | $config->getId(), |
166 | 166 | $config->getMountPoint(), |
@@ -193,23 +193,23 @@ discard block |
||
193 | 193 | 'enable_sharing' => false, |
194 | 194 | 'encoding_compatibility' => false |
195 | 195 | ]; |
196 | - $rows = array_map(function (StorageConfig $config) use ($userId, $defaultMountOptions, $full) { |
|
196 | + $rows = array_map(function(StorageConfig $config) use ($userId, $defaultMountOptions, $full) { |
|
197 | 197 | $storageConfig = $config->getBackendOptions(); |
198 | 198 | $keys = array_keys($storageConfig); |
199 | 199 | $values = array_values($storageConfig); |
200 | 200 | |
201 | 201 | if (!$full) { |
202 | - $values = array_map(function ($value) { |
|
202 | + $values = array_map(function($value) { |
|
203 | 203 | if (is_string($value) && strlen($value) > 32) { |
204 | - return substr($value, 0, 6) . '...' . substr($value, -6, 6); |
|
204 | + return substr($value, 0, 6).'...'.substr($value, -6, 6); |
|
205 | 205 | } else { |
206 | 206 | return $value; |
207 | 207 | } |
208 | 208 | }, $values); |
209 | 209 | } |
210 | 210 | |
211 | - $configStrings = array_map(function ($key, $value) { |
|
212 | - return $key . ': ' . json_encode($value); |
|
211 | + $configStrings = array_map(function($key, $value) { |
|
212 | + return $key.': '.json_encode($value); |
|
213 | 213 | }, $keys, $values); |
214 | 214 | $configString = implode(', ', $configStrings); |
215 | 215 | |
@@ -223,8 +223,8 @@ discard block |
||
223 | 223 | $keys = array_keys($mountOptions); |
224 | 224 | $values = array_values($mountOptions); |
225 | 225 | |
226 | - $optionsStrings = array_map(function ($key, $value) { |
|
227 | - return $key . ': ' . json_encode($value); |
|
226 | + $optionsStrings = array_map(function($key, $value) { |
|
227 | + return $key.': '.json_encode($value); |
|
228 | 228 | }, $keys, $values); |
229 | 229 | $optionsString = implode(', ', $optionsStrings); |
230 | 230 |
@@ -68,7 +68,7 @@ |
||
68 | 68 | try { |
69 | 69 | $mount = $this->globalService->getStorage($mountId); |
70 | 70 | } catch (NotFoundException $e) { |
71 | - $output->writeln('<error>Mount with id "' . $mountId . ' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
71 | + $output->writeln('<error>Mount with id "'.$mountId.' not found, check "occ files_external:list" to get available mounts"</error>'); |
|
72 | 72 | return 404; |
73 | 73 | } |
74 | 74 |
@@ -120,7 +120,7 @@ discard block |
||
120 | 120 | return 1; |
121 | 121 | } |
122 | 122 | if (!$storage instanceof INotifyStorage) { |
123 | - $output->writeln('<error>Mount of type "' . $mount->getBackend()->getText() . '" does not support active update notifications</error>'); |
|
123 | + $output->writeln('<error>Mount of type "'.$mount->getBackend()->getText().'" does not support active update notifications</error>'); |
|
124 | 124 | return 1; |
125 | 125 | } |
126 | 126 | |
@@ -129,7 +129,7 @@ discard block |
||
129 | 129 | $path = trim($input->getOption('path'), '/'); |
130 | 130 | $notifyHandler = $storage->notify($path); |
131 | 131 | $this->selfTest($storage, $notifyHandler, $verbose, $output); |
132 | - $notifyHandler->listen(function (IChange $change) use ($mount, $verbose, $output) { |
|
132 | + $notifyHandler->listen(function(IChange $change) use ($mount, $verbose, $output) { |
|
133 | 133 | if ($verbose) { |
134 | 134 | $this->logUpdate($change, $output); |
135 | 135 | } |
@@ -171,9 +171,9 @@ discard block |
||
171 | 171 | return; |
172 | 172 | } |
173 | 173 | |
174 | - $text .= ' ' . $change->getPath(); |
|
174 | + $text .= ' '.$change->getPath(); |
|
175 | 175 | if ($change instanceof IRenameChange) { |
176 | - $text .= ' to ' . $change->getTargetPath(); |
|
176 | + $text .= ' to '.$change->getTargetPath(); |
|
177 | 177 | } |
178 | 178 | |
179 | 179 | $output->writeln($text); |