@@ -6,20 +6,20 @@ |
||
6 | 6 | $baseDir = $vendorDir; |
7 | 7 | |
8 | 8 | return array( |
9 | - 'Composer\\InstalledVersions' => $vendorDir . '/composer/InstalledVersions.php', |
|
10 | - 'OCA\\Federation\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php', |
|
11 | - 'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir . '/../lib/BackgroundJob/GetSharedSecret.php', |
|
12 | - 'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir . '/../lib/BackgroundJob/RequestSharedSecret.php', |
|
13 | - 'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir . '/../lib/Command/SyncFederationAddressBooks.php', |
|
14 | - 'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir . '/../lib/Controller/OCSAuthAPIController.php', |
|
15 | - 'OCA\\Federation\\Controller\\SettingsController' => $baseDir . '/../lib/Controller/SettingsController.php', |
|
16 | - 'OCA\\Federation\\DAV\\FedAuth' => $baseDir . '/../lib/DAV/FedAuth.php', |
|
17 | - 'OCA\\Federation\\DbHandler' => $baseDir . '/../lib/DbHandler.php', |
|
18 | - 'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir . '/../lib/Listener/SabrePluginAuthInitListener.php', |
|
19 | - 'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir . '/../lib/Middleware/AddServerMiddleware.php', |
|
20 | - 'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir . '/../lib/Migration/Version1010Date20200630191302.php', |
|
21 | - 'OCA\\Federation\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php', |
|
22 | - 'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir . '/../lib/SyncFederationAddressBooks.php', |
|
23 | - 'OCA\\Federation\\SyncJob' => $baseDir . '/../lib/SyncJob.php', |
|
24 | - 'OCA\\Federation\\TrustedServers' => $baseDir . '/../lib/TrustedServers.php', |
|
9 | + 'Composer\\InstalledVersions' => $vendorDir.'/composer/InstalledVersions.php', |
|
10 | + 'OCA\\Federation\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php', |
|
11 | + 'OCA\\Federation\\BackgroundJob\\GetSharedSecret' => $baseDir.'/../lib/BackgroundJob/GetSharedSecret.php', |
|
12 | + 'OCA\\Federation\\BackgroundJob\\RequestSharedSecret' => $baseDir.'/../lib/BackgroundJob/RequestSharedSecret.php', |
|
13 | + 'OCA\\Federation\\Command\\SyncFederationAddressBooks' => $baseDir.'/../lib/Command/SyncFederationAddressBooks.php', |
|
14 | + 'OCA\\Federation\\Controller\\OCSAuthAPIController' => $baseDir.'/../lib/Controller/OCSAuthAPIController.php', |
|
15 | + 'OCA\\Federation\\Controller\\SettingsController' => $baseDir.'/../lib/Controller/SettingsController.php', |
|
16 | + 'OCA\\Federation\\DAV\\FedAuth' => $baseDir.'/../lib/DAV/FedAuth.php', |
|
17 | + 'OCA\\Federation\\DbHandler' => $baseDir.'/../lib/DbHandler.php', |
|
18 | + 'OCA\\Federation\\Listener\\SabrePluginAuthInitListener' => $baseDir.'/../lib/Listener/SabrePluginAuthInitListener.php', |
|
19 | + 'OCA\\Federation\\Middleware\\AddServerMiddleware' => $baseDir.'/../lib/Middleware/AddServerMiddleware.php', |
|
20 | + 'OCA\\Federation\\Migration\\Version1010Date20200630191302' => $baseDir.'/../lib/Migration/Version1010Date20200630191302.php', |
|
21 | + 'OCA\\Federation\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php', |
|
22 | + 'OCA\\Federation\\SyncFederationAddressBooks' => $baseDir.'/../lib/SyncFederationAddressBooks.php', |
|
23 | + 'OCA\\Federation\\SyncJob' => $baseDir.'/../lib/SyncJob.php', |
|
24 | + 'OCA\\Federation\\TrustedServers' => $baseDir.'/../lib/TrustedServers.php', |
|
25 | 25 | ); |
@@ -54,11 +54,11 @@ |
||
54 | 54 | */ |
55 | 55 | public function run($arguments): void { |
56 | 56 | $uploadList = []; |
57 | - $this->userManager->callForSeenUsers(function (IUser $user) use (&$uploadList) { |
|
57 | + $this->userManager->callForSeenUsers(function(IUser $user) use (&$uploadList) { |
|
58 | 58 | $userId = $user->getUID(); |
59 | 59 | try { |
60 | 60 | \OC_Util::setupFS($userId); |
61 | - $filesExternalUploadsFolder = $this->rootFolder->get($userId . '/files_external/uploads'); |
|
61 | + $filesExternalUploadsFolder = $this->rootFolder->get($userId.'/files_external/uploads'); |
|
62 | 62 | } catch (NotFoundException $e) { |
63 | 63 | \OC_Util::tearDownFS(); |
64 | 64 | return; |
@@ -44,7 +44,7 @@ |
||
44 | 44 | } |
45 | 45 | |
46 | 46 | public function run($arguments) { |
47 | - $this->userManager->callForSeenUsers(function (IUser $user) { |
|
47 | + $this->userManager->callForSeenUsers(function(IUser $user) { |
|
48 | 48 | $this->config->setUserValue($user->getUID(), 'lookup_server_connector', 'dataSend', '1'); |
49 | 49 | }); |
50 | 50 | } |
@@ -78,7 +78,7 @@ |
||
78 | 78 | $this->logger->debug('Default user calendar reset'); |
79 | 79 | } catch (Throwable $e) { |
80 | 80 | // Any error with activities shouldn't abort the calendar deletion, so we just log it |
81 | - $this->logger->error('Error generating activities for a deleted calendar: ' . $e->getMessage(), [ |
|
81 | + $this->logger->error('Error generating activities for a deleted calendar: '.$e->getMessage(), [ |
|
82 | 82 | 'exception' => $e, |
83 | 83 | ]); |
84 | 84 | } |
@@ -125,7 +125,7 @@ discard block |
||
125 | 125 | // build the fields |
126 | 126 | foreach ($properties as $property => $updated) { |
127 | 127 | $column = $entity->propertyToColumn($property); |
128 | - $getter = 'get' . ucfirst($property); |
|
128 | + $getter = 'get'.ucfirst($property); |
|
129 | 129 | $value = $entity->$getter(); |
130 | 130 | |
131 | 131 | $type = $this->getParameterTypeForProperty($entity, $property); |
@@ -199,7 +199,7 @@ discard block |
||
199 | 199 | // build the fields |
200 | 200 | foreach ($properties as $property => $updated) { |
201 | 201 | $column = $entity->propertyToColumn($property); |
202 | - $getter = 'get' . ucfirst($property); |
|
202 | + $getter = 'get'.ucfirst($property); |
|
203 | 203 | $value = $entity->$getter(); |
204 | 204 | |
205 | 205 | $type = $this->getParameterTypeForProperty($entity, $property); |
@@ -229,11 +229,11 @@ discard block |
||
229 | 229 | protected function getParameterTypeForProperty(Entity $entity, string $property) { |
230 | 230 | $types = $entity->getFieldTypes(); |
231 | 231 | |
232 | - if (!isset($types[ $property ])) { |
|
232 | + if (!isset($types[$property])) { |
|
233 | 233 | return IQueryBuilder::PARAM_STR; |
234 | 234 | } |
235 | 235 | |
236 | - switch ($types[ $property ]) { |
|
236 | + switch ($types[$property]) { |
|
237 | 237 | case 'int': |
238 | 238 | case 'integer': |
239 | 239 | return IQueryBuilder::PARAM_INT; |
@@ -294,8 +294,8 @@ discard block |
||
294 | 294 | * @since 14.0.0 |
295 | 295 | */ |
296 | 296 | private function buildDebugMessage(string $msg, IQueryBuilder $sql): string { |
297 | - return $msg . |
|
298 | - ': query "' . $sql->getSQL() . '"; '; |
|
297 | + return $msg. |
|
298 | + ': query "'.$sql->getSQL().'"; '; |
|
299 | 299 | } |
300 | 300 | |
301 | 301 | |
@@ -309,7 +309,7 @@ discard block |
||
309 | 309 | * @since 14.0.0 |
310 | 310 | */ |
311 | 311 | protected function mapRowToEntity(array $row): Entity { |
312 | - return \call_user_func($this->entityClass .'::fromRow', $row); |
|
312 | + return \call_user_func($this->entityClass.'::fromRow', $row); |
|
313 | 313 | } |
314 | 314 | |
315 | 315 |
@@ -62,7 +62,7 @@ discard block |
||
62 | 62 | $numUpdated = 0; |
63 | 63 | $numRemoved = 0; |
64 | 64 | |
65 | - $this->userManager->callForSeenUsers(function (IUser $user) use (&$numUpdated, &$numRemoved) { |
|
65 | + $this->userManager->callForSeenUsers(function(IUser $user) use (&$numUpdated, &$numRemoved) { |
|
66 | 66 | $account = $this->accountManager->getAccount($user); |
67 | 67 | $property = $account->getProperty(IAccountManager::PROPERTY_PHONE); |
68 | 68 | |
@@ -82,7 +82,7 @@ discard block |
||
82 | 82 | }); |
83 | 83 | |
84 | 84 | if ($numRemoved > 0 || $numUpdated > 0) { |
85 | - $output->info('Updated ' . $numUpdated . ' entries and cleaned ' . $numRemoved . ' invalid phone numbers'); |
|
85 | + $output->info('Updated '.$numUpdated.' entries and cleaned '.$numRemoved.' invalid phone numbers'); |
|
86 | 86 | } |
87 | 87 | } |
88 | 88 | } |
@@ -107,7 +107,7 @@ discard block |
||
107 | 107 | } |
108 | 108 | |
109 | 109 | protected function run($argument) { |
110 | - $try = (int)$argument['try'] + 1; |
|
110 | + $try = (int) $argument['try'] + 1; |
|
111 | 111 | |
112 | 112 | switch ($argument['type']) { |
113 | 113 | case IAccountManager::PROPERTY_WEBSITE: |
@@ -119,7 +119,7 @@ discard block |
||
119 | 119 | break; |
120 | 120 | default: |
121 | 121 | // no valid type given, no need to retry |
122 | - $this->logger->error($argument['type'] . ' is no valid type for user account data.'); |
|
122 | + $this->logger->error($argument['type'].' is no valid type for user account data.'); |
|
123 | 123 | $result = true; |
124 | 124 | } |
125 | 125 | |
@@ -137,7 +137,7 @@ discard block |
||
137 | 137 | protected function verifyWebsite(array $argument) { |
138 | 138 | $result = false; |
139 | 139 | |
140 | - $url = rtrim($argument['data'], '/') . '/.well-known/' . 'CloudIdVerificationCode.txt'; |
|
140 | + $url = rtrim($argument['data'], '/').'/.well-known/'.'CloudIdVerificationCode.txt'; |
|
141 | 141 | |
142 | 142 | $client = $this->httpClientService->newClient(); |
143 | 143 | try { |
@@ -154,7 +154,7 @@ discard block |
||
154 | 154 | $user = $this->userManager->get($argument['uid']); |
155 | 155 | // we don't check a valid user -> give up |
156 | 156 | if ($user === null) { |
157 | - $this->logger->error($argument['uid'] . ' doesn\'t exist, can\'t verify user data.'); |
|
157 | + $this->logger->error($argument['uid'].' doesn\'t exist, can\'t verify user data.'); |
|
158 | 158 | return $result; |
159 | 159 | } |
160 | 160 | $userAccount = $this->accountManager->getAccount($user); |
@@ -180,7 +180,7 @@ discard block |
||
180 | 180 | |
181 | 181 | // we don't check a valid user -> give up |
182 | 182 | if ($user === null) { |
183 | - $this->logger->info($argument['uid'] . ' doesn\'t exist, can\'t verify user data.'); |
|
183 | + $this->logger->info($argument['uid'].' doesn\'t exist, can\'t verify user data.'); |
|
184 | 184 | return true; |
185 | 185 | } |
186 | 186 | |
@@ -222,7 +222,7 @@ discard block |
||
222 | 222 | try { |
223 | 223 | $client = $this->httpClientService->newClient(); |
224 | 224 | $response = $client->get( |
225 | - $this->lookupServerUrl . '/users?search=' . urlencode($cloudId) . '&exactCloudId=1', |
|
225 | + $this->lookupServerUrl.'/users?search='.urlencode($cloudId).'&exactCloudId=1', |
|
226 | 226 | [ |
227 | 227 | 'timeout' => 10, |
228 | 228 | 'connect_timeout' => 3, |
@@ -254,7 +254,7 @@ discard block |
||
254 | 254 | 'data' => $argument['data'], |
255 | 255 | 'type' => $argument['type'], |
256 | 256 | 'uid' => $argument['uid'], |
257 | - 'try' => (int)$argument['try'] + 1, |
|
257 | + 'try' => (int) $argument['try'] + 1, |
|
258 | 258 | 'lastRun' => time() |
259 | 259 | ] |
260 | 260 | ); |
@@ -267,7 +267,7 @@ discard block |
||
267 | 267 | * @return bool |
268 | 268 | */ |
269 | 269 | protected function shouldRun(array $argument) { |
270 | - $lastRun = (int)$argument['lastRun']; |
|
270 | + $lastRun = (int) $argument['lastRun']; |
|
271 | 271 | return ((time() - $lastRun) > $this->interval); |
272 | 272 | } |
273 | 273 |
@@ -58,9 +58,9 @@ |
||
58 | 58 | * @since 14.0.0 |
59 | 59 | */ |
60 | 60 | protected function shouldRotateBySize():bool { |
61 | - if ((int)$this->maxSize > 0 && file_exists($this->filePath)) { |
|
61 | + if ((int) $this->maxSize > 0 && file_exists($this->filePath)) { |
|
62 | 62 | $filesize = @filesize($this->filePath); |
63 | - if ($filesize >= (int)$this->maxSize) { |
|
63 | + if ($filesize >= (int) $this->maxSize) { |
|
64 | 64 | return true; |
65 | 65 | } |
66 | 66 | } |
@@ -32,8 +32,8 @@ discard block |
||
32 | 32 | OC_Util::checkLoggedIn(); |
33 | 33 | \OC::$server->getSession()->close(); |
34 | 34 | |
35 | -$files = isset($_GET['files']) ? (string)$_GET['files'] : ''; |
|
36 | -$dir = isset($_GET['dir']) ? (string)$_GET['dir'] : ''; |
|
35 | +$files = isset($_GET['files']) ? (string) $_GET['files'] : ''; |
|
36 | +$dir = isset($_GET['dir']) ? (string) $_GET['dir'] : ''; |
|
37 | 37 | |
38 | 38 | $files_list = json_decode($files); |
39 | 39 | // in case we get only a single file |
@@ -66,7 +66,7 @@ discard block |
||
66 | 66 | } |
67 | 67 | } |
68 | 68 | |
69 | -$server_params = [ 'head' => \OC::$server->getRequest()->getMethod() === 'HEAD' ]; |
|
69 | +$server_params = ['head' => \OC::$server->getRequest()->getMethod() === 'HEAD']; |
|
70 | 70 | |
71 | 71 | /** |
72 | 72 | * Http range requests support |