@@ -62,7 +62,7 @@ |
||
62 | 62 | // assign default values |
63 | 63 | $config = new Configuration('', false); |
64 | 64 | $defaults = $config->getDefaults(); |
65 | - foreach($defaults as $key => $default) { |
|
65 | + foreach ($defaults as $key => $default) { |
|
66 | 66 | $parameters[$key.'_default'] = $default; |
67 | 67 | } |
68 | 68 |
@@ -47,7 +47,7 @@ discard block |
||
47 | 47 | $this->logger = $serverContainer->getLogger(); |
48 | 48 | $this->helper = $helper; |
49 | 49 | $this->deletedUsersIndex = $deletedUsersIndex; |
50 | - foreach ($serverContainer->getUserManager()->getBackends() as $backend){ |
|
50 | + foreach ($serverContainer->getUserManager()->getBackends() as $backend) { |
|
51 | 51 | $this->logger->debug('instance '.get_class($backend).' backend.', ['app' => 'user_ldap']); |
52 | 52 | if ($backend instanceof IUserLDAP) { |
53 | 53 | $this->backend = $backend; |
@@ -64,11 +64,11 @@ discard block |
||
64 | 64 | * @throws \Exception if translation was unsuccessful |
65 | 65 | */ |
66 | 66 | public function getUserDN($uid) { |
67 | - if(!$this->backend->userExists($uid)){ |
|
67 | + if (!$this->backend->userExists($uid)) { |
|
68 | 68 | throw new \Exception('User id not found in LDAP'); |
69 | 69 | } |
70 | 70 | $result = $this->backend->getLDAPAccess($uid)->username2dn($uid); |
71 | - if(!$result){ |
|
71 | + if (!$result) { |
|
72 | 72 | throw new \Exception('Translation to LDAP DN unsuccessful'); |
73 | 73 | } |
74 | 74 | return $result; |
@@ -83,7 +83,7 @@ discard block |
||
83 | 83 | */ |
84 | 84 | public function getUserName($dn) { |
85 | 85 | $result = $this->backend->dn2UserName($dn); |
86 | - if(!$result){ |
|
86 | + if (!$result) { |
|
87 | 87 | throw new \Exception('Translation to internal user name unsuccessful'); |
88 | 88 | } |
89 | 89 | return $result; |
@@ -115,7 +115,7 @@ discard block |
||
115 | 115 | * @throws \Exception if user id was not found in LDAP |
116 | 116 | */ |
117 | 117 | public function getLDAPConnection($uid) { |
118 | - if(!$this->backend->userExists($uid)){ |
|
118 | + if (!$this->backend->userExists($uid)) { |
|
119 | 119 | throw new \Exception('User id not found in LDAP'); |
120 | 120 | } |
121 | 121 | return $this->backend->getNewLDAPConnection($uid); |
@@ -128,7 +128,7 @@ discard block |
||
128 | 128 | * @throws \Exception if user id was not found in LDAP |
129 | 129 | */ |
130 | 130 | public function getLDAPBaseUsers($uid) { |
131 | - if(!$this->backend->userExists($uid)){ |
|
131 | + if (!$this->backend->userExists($uid)) { |
|
132 | 132 | throw new \Exception('User id not found in LDAP'); |
133 | 133 | } |
134 | 134 | return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_users']; |
@@ -141,7 +141,7 @@ discard block |
||
141 | 141 | * @throws \Exception if user id was not found in LDAP |
142 | 142 | */ |
143 | 143 | public function getLDAPBaseGroups($uid) { |
144 | - if(!$this->backend->userExists($uid)){ |
|
144 | + if (!$this->backend->userExists($uid)) { |
|
145 | 145 | throw new \Exception('User id not found in LDAP'); |
146 | 146 | } |
147 | 147 | return $this->backend->getLDAPAccess($uid)->getConnection()->getConfiguration()['ldap_base_groups']; |
@@ -153,7 +153,7 @@ discard block |
||
153 | 153 | * @throws \Exception if user id was not found in LDAP |
154 | 154 | */ |
155 | 155 | public function clearCache($uid) { |
156 | - if(!$this->backend->userExists($uid)){ |
|
156 | + if (!$this->backend->userExists($uid)) { |
|
157 | 157 | throw new \Exception('User id not found in LDAP'); |
158 | 158 | } |
159 | 159 | $this->backend->getLDAPAccess($uid)->getConnection()->clearCache(); |
@@ -41,7 +41,7 @@ |
||
41 | 41 | $application->registerRoutes($this, [ |
42 | 42 | 'ocs' => [ |
43 | 43 | ['name' => 'ConfigAPI#create', 'url' => '/api/v1/config', 'verb' => 'POST'], |
44 | - ['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'], |
|
44 | + ['name' => 'ConfigAPI#show', 'url' => '/api/v1/config/{configID}', 'verb' => 'GET'], |
|
45 | 45 | ['name' => 'ConfigAPI#modify', 'url' => '/api/v1/config/{configID}', 'verb' => 'PUT'], |
46 | 46 | ['name' => 'ConfigAPI#delete', 'url' => '/api/v1/config/{configID}', 'verb' => 'DELETE'], |
47 | 47 | ] |
@@ -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 |
@@ -58,7 +58,7 @@ discard block |
||
58 | 58 | ) { |
59 | 59 | $backend = $this->backendService->getBackend($storageOptions['backend']); |
60 | 60 | if (!$backend) { |
61 | - throw new \UnexpectedValueException('Invalid backend ' . $storageOptions['backend']); |
|
61 | + throw new \UnexpectedValueException('Invalid backend '.$storageOptions['backend']); |
|
62 | 62 | } |
63 | 63 | $storageConfig->setBackend($backend); |
64 | 64 | if (isset($storageOptions['authMechanism']) && $storageOptions['authMechanism'] !== 'builtin::builtin') { |
@@ -68,7 +68,7 @@ discard block |
||
68 | 68 | $storageOptions['authMechanism'] = 'null'; // to make error handling easier |
69 | 69 | } |
70 | 70 | if (!$authMechanism) { |
71 | - throw new \UnexpectedValueException('Invalid authentication mechanism ' . $storageOptions['authMechanism']); |
|
71 | + throw new \UnexpectedValueException('Invalid authentication mechanism '.$storageOptions['authMechanism']); |
|
72 | 72 | } |
73 | 73 | $storageConfig->setAuthMechanism($authMechanism); |
74 | 74 | $storageConfig->setBackendOptions($storageOptions['options']); |
@@ -142,7 +142,7 @@ discard block |
||
142 | 142 | // something went wrong, skip |
143 | 143 | \OCP\Util::writeLog( |
144 | 144 | 'files_external', |
145 | - 'Could not parse mount point "' . $rootMountPath . '"', |
|
145 | + 'Could not parse mount point "'.$rootMountPath.'"', |
|
146 | 146 | \OCP\Util::ERROR |
147 | 147 | ); |
148 | 148 | continue; |
@@ -158,7 +158,7 @@ discard block |
||
158 | 158 | $storageOptions['authMechanism'] = null; // ensure config hash works |
159 | 159 | } |
160 | 160 | if (isset($storageOptions['id'])) { |
161 | - $configId = (int)$storageOptions['id']; |
|
161 | + $configId = (int) $storageOptions['id']; |
|
162 | 162 | if (isset($storages[$configId])) { |
163 | 163 | $currentStorage = $storages[$configId]; |
164 | 164 | } |
@@ -194,7 +194,7 @@ discard block |
||
194 | 194 | // don't die if a storage backend doesn't exist |
195 | 195 | \OCP\Util::writeLog( |
196 | 196 | 'files_external', |
197 | - 'Could not load storage: "' . $e->getMessage() . '"', |
|
197 | + 'Could not load storage: "'.$e->getMessage().'"', |
|
198 | 198 | \OCP\Util::ERROR |
199 | 199 | ); |
200 | 200 | } |