@@ -222,7 +222,7 @@ discard block |
||
| 222 | 222 | $recipient = $share->getInitiator(); |
| 223 | 223 | $sharedTo = $recipient->getDisplayName(); |
| 224 | 224 | if (!$this->configService->isLocalInstance($recipient->getInstance())) { |
| 225 | - $sharedTo .= '@' . $recipient->getInstance(); |
|
| 225 | + $sharedTo .= '@'.$recipient->getInstance(); |
|
| 226 | 226 | } |
| 227 | 227 | } |
| 228 | 228 | $circle = $share->getCircle(); |
@@ -232,15 +232,15 @@ discard block |
||
| 232 | 232 | $share->getShareOwner(), |
| 233 | 233 | $share->getFileTarget(), |
| 234 | 234 | $share->getSharedBy(), |
| 235 | - $circle->getDisplayName() . ' (' . $share->getSharedWith() |
|
| 236 | - . ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')' |
|
| 235 | + $circle->getDisplayName().' ('.$share->getSharedWith() |
|
| 236 | + . ', '.Circle::$DEF_SOURCE[$circle->getSource()].')' |
|
| 237 | 237 | ]; |
| 238 | 238 | |
| 239 | 239 | if (!$filterRecipient) { |
| 240 | 240 | $row = array_merge( |
| 241 | 241 | $row, [ |
| 242 | - $sharedTo . ' (' . $recipient->getSingleId() . ', ' |
|
| 243 | - . Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')', |
|
| 242 | + $sharedTo.' ('.$recipient->getSingleId().', ' |
|
| 243 | + . Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()].')', |
|
| 244 | 244 | (($share->getChildId() > 0) ? $share->getChildFileTarget( |
| 245 | 245 | ) : $share->getFileTarget()), |
| 246 | 246 | ] |
@@ -213,10 +213,10 @@ discard block |
||
| 213 | 213 | return 0; |
| 214 | 214 | } |
| 215 | 215 | |
| 216 | - $output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>'); |
|
| 217 | - $output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>'); |
|
| 218 | - $output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>'); |
|
| 219 | - $output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>'); |
|
| 216 | + $output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>'); |
|
| 217 | + $output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>'); |
|
| 218 | + $output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>'); |
|
| 219 | + $output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>'); |
|
| 220 | 220 | |
| 221 | 221 | $output->writeln(''); |
| 222 | 222 | $output->writeln('Memberships:'); |
@@ -225,14 +225,14 @@ discard block |
||
| 225 | 225 | if ($count === 0) { |
| 226 | 226 | $output->writeln('(database not updated)'); |
| 227 | 227 | } else { |
| 228 | - $output->writeln('(' . $count . ' entries generated/updated in the database)'); |
|
| 228 | + $output->writeln('('.$count.' entries generated/updated in the database)'); |
|
| 229 | 229 | } |
| 230 | 230 | |
| 231 | 231 | foreach ($federatedUser->getMemberships() as $membership) { |
| 232 | 232 | $this->memberships[$membership->getCircleId()] = $membership; |
| 233 | 233 | $output->writeln( |
| 234 | - '- <info>' . $membership->getCircleId() . '</info> (' |
|
| 235 | - . Member::$DEF_LEVEL[$membership->getLevel()] . ')' |
|
| 234 | + '- <info>'.$membership->getCircleId().'</info> (' |
|
| 235 | + . Member::$DEF_LEVEL[$membership->getLevel()].')' |
|
| 236 | 236 | ); |
| 237 | 237 | } |
| 238 | 238 | |
@@ -305,9 +305,9 @@ discard block |
||
| 305 | 305 | if ($lineNumber === 2) { |
| 306 | 306 | return ''; |
| 307 | 307 | } |
| 308 | - $line .= '<info>' . $federatedUser->getSingleId() . '</info>'; |
|
| 308 | + $line .= '<info>'.$federatedUser->getSingleId().'</info>'; |
|
| 309 | 309 | if (!$this->configService->isLocalInstance($federatedUser->getInstance())) { |
| 310 | - $line .= '@' . $federatedUser->getInstance(); |
|
| 310 | + $line .= '@'.$federatedUser->getInstance(); |
|
| 311 | 311 | } |
| 312 | 312 | |
| 313 | 313 | return $line; |
@@ -319,28 +319,28 @@ discard block |
||
| 319 | 319 | $circle = $member->getCircle(); |
| 320 | 320 | |
| 321 | 321 | if ($lineNumber === 1) { |
| 322 | - $line .= '<info>' . $circle->getSingleId() . '</info>'; |
|
| 322 | + $line .= '<info>'.$circle->getSingleId().'</info>'; |
|
| 323 | 323 | if (!$this->configService->isLocalInstance($circle->getInstance())) { |
| 324 | - $line .= '@' . $circle->getInstance(); |
|
| 324 | + $line .= '@'.$circle->getInstance(); |
|
| 325 | 325 | } |
| 326 | - $line .= ' (' . ($this->input->getOption('display-name') ? |
|
| 327 | - $circle->getDisplayName() : $circle->getName()) . ')'; |
|
| 328 | - $line .= ' <info>MemberId</info>: ' . $member->getId(); |
|
| 329 | - $line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()]; |
|
| 326 | + $line .= ' ('.($this->input->getOption('display-name') ? |
|
| 327 | + $circle->getDisplayName() : $circle->getName()).')'; |
|
| 328 | + $line .= ' <info>MemberId</info>: '.$member->getId(); |
|
| 329 | + $line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()]; |
|
| 330 | 330 | |
| 331 | 331 | $knownMembership = $this->memberships[$member->getCircleId()]; |
| 332 | 332 | if ($member->getLevel() !== $knownMembership->getLevel()) { |
| 333 | - $line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')'; |
|
| 333 | + $line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')'; |
|
| 334 | 334 | } |
| 335 | 335 | } |
| 336 | 336 | if ($lineNumber === 2) { |
| 337 | 337 | $owner = $circle->getOwner(); |
| 338 | - $line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance(); |
|
| 338 | + $line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance(); |
|
| 339 | 339 | if ($owner->hasBasedOn()) { |
| 340 | - $line .= ' (' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') '; |
|
| 340 | + $line .= ' ('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') '; |
|
| 341 | 341 | } |
| 342 | 342 | $type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG)); |
| 343 | - $line .= ($type === '') ? '' : '<info>Config</info>: ' . $type; |
|
| 343 | + $line .= ($type === '') ? '' : '<info>Config</info>: '.$type; |
|
| 344 | 344 | } |
| 345 | 345 | |
| 346 | 346 | return $line; |
@@ -397,7 +397,7 @@ discard block |
||
| 397 | 397 | ); |
| 398 | 398 | } |
| 399 | 399 | |
| 400 | - $output->writeln($count . ' memberships updated'); |
|
| 400 | + $output->writeln($count.' memberships updated'); |
|
| 401 | 401 | } |
| 402 | 402 | |
| 403 | 403 | } |
@@ -148,7 +148,7 @@ |
||
| 148 | 148 | * @throws UnknownRemoteException |
| 149 | 149 | * @throws UserTypeNotFoundException |
| 150 | 150 | * @throws FederatedItemException |
| 151 | - * @throws MemberNotFoundException |
|
| 151 | + * @throws MemberNotFoundException |
|
| 152 | 152 | * @throws SingleCircleNotFoundException |
| 153 | 153 | */ |
| 154 | 154 | protected function execute(InputInterface $input, OutputInterface $output): int { |
@@ -280,7 +280,7 @@ |
||
| 280 | 280 | */ |
| 281 | 281 | public function groupDeleted(string $groupId): void { |
| 282 | 282 | $circle = new Circle(); |
| 283 | - $circle->setName('group:' . $groupId) |
|
| 283 | + $circle->setName('group:'.$groupId) |
|
| 284 | 284 | ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN) |
| 285 | 285 | ->setSource(Member::TYPE_GROUP); |
| 286 | 286 | |
@@ -122,7 +122,7 @@ discard block |
||
| 122 | 122 | return $value; |
| 123 | 123 | } |
| 124 | 124 | |
| 125 | - if (($value = $this->config->getSystemValue('circles.' . $key, '')) !== '') { |
|
| 125 | + if (($value = $this->config->getSystemValue('circles.'.$key, '')) !== '') { |
|
| 126 | 126 | return $value; |
| 127 | 127 | } |
| 128 | 128 | |
@@ -379,7 +379,7 @@ discard block |
||
| 379 | 379 | } |
| 380 | 380 | |
| 381 | 381 | if (array_key_exists('port', $frontal)) { |
| 382 | - return $frontal['host'] . ':' . $frontal['port']; |
|
| 382 | + return $frontal['host'].':'.$frontal['port']; |
|
| 383 | 383 | } else { |
| 384 | 384 | return $frontal['host']; |
| 385 | 385 | } |
@@ -401,13 +401,13 @@ discard block |
||
| 401 | 401 | * @return string |
| 402 | 402 | */ |
| 403 | 403 | public function getFrontalPath(string $route = 'circles.Remote.appService', array $args = []): string { |
| 404 | - $base = $this->getAppValue(self::FRONTAL_CLOUD_SCHEME) . '://' . $this->getFrontalInstance(); |
|
| 404 | + $base = $this->getAppValue(self::FRONTAL_CLOUD_SCHEME).'://'.$this->getFrontalInstance(); |
|
| 405 | 405 | |
| 406 | 406 | if ($route === '') { |
| 407 | 407 | return $base; |
| 408 | 408 | } |
| 409 | 409 | |
| 410 | - return $base . $this->urlGenerator->linkToRoute($route, $args); |
|
| 410 | + return $base.$this->urlGenerator->linkToRoute($route, $args); |
|
| 411 | 411 | } |
| 412 | 412 | |
| 413 | 413 | /** |
@@ -513,7 +513,7 @@ discard block |
||
| 513 | 513 | $ncBase = substr($ncBase, 0, -strlen($forcedPath)); |
| 514 | 514 | } |
| 515 | 515 | |
| 516 | - return rtrim($ncBase, '/') . $link; |
|
| 516 | + return rtrim($ncBase, '/').$link; |
|
| 517 | 517 | } |
| 518 | 518 | |
| 519 | 519 | } |
@@ -320,7 +320,7 @@ discard block |
||
| 320 | 320 | public function getLocalFederatedUser(string $userId): FederatedUser { |
| 321 | 321 | $user = $this->userManager->get($userId); |
| 322 | 322 | if ($user === null) { |
| 323 | - throw new FederatedUserNotFoundException('user ' . $userId . ' not found'); |
|
| 323 | + throw new FederatedUserNotFoundException('user '.$userId.' not found'); |
|
| 324 | 324 | } |
| 325 | 325 | |
| 326 | 326 | $federatedUser = new FederatedUser(); |
@@ -721,7 +721,7 @@ discard block |
||
| 721 | 721 | $prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app' |
| 722 | 722 | : Member::$TYPE[$federatedUser->getUserType()]; |
| 723 | 723 | |
| 724 | - $circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id) |
|
| 724 | + $circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id) |
|
| 725 | 725 | ->setDisplayName($this->getLocalDisplayName($federatedUser)) |
| 726 | 726 | ->setSingleId($id) |
| 727 | 727 | ->setSource($source); |
@@ -851,7 +851,7 @@ discard block |
||
| 851 | 851 | $owner = $this->getCurrentApp(); |
| 852 | 852 | |
| 853 | 853 | $circle = new Circle(); |
| 854 | - $circle->setName('group:' . $groupId) |
|
| 854 | + $circle->setName('group:'.$groupId) |
|
| 855 | 855 | ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN) |
| 856 | 856 | ->setSingleId($this->token(ManagedModel::ID_LENGTH)) |
| 857 | 857 | ->setSource(Member::TYPE_GROUP); |
@@ -194,7 +194,7 @@ |
||
| 194 | 194 | throw new OCSException('works only from local instance', 404); |
| 195 | 195 | } |
| 196 | 196 | |
| 197 | - $userId = $currentUser->getUserId() . '/' . $userId; |
|
| 197 | + $userId = $currentUser->getUserId().'/'.$userId; |
|
| 198 | 198 | } |
| 199 | 199 | |
| 200 | 200 | $federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type); |
@@ -74,8 +74,8 @@ |
||
| 74 | 74 | $result[$instance] = $item->gData('files'); |
| 75 | 75 | } |
| 76 | 76 | |
| 77 | - \OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result)); |
|
| 78 | - \OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers)); |
|
| 77 | + \OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result)); |
|
| 78 | + \OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers)); |
|
| 79 | 79 | } |
| 80 | 80 | |
| 81 | 81 | } |
@@ -109,7 +109,7 @@ |
||
| 109 | 109 | * @return string |
| 110 | 110 | */ |
| 111 | 111 | protected function stripPath($path) { |
| 112 | - $prefix = '/' . $this->userId . '/files'; |
|
| 112 | + $prefix = '/'.$this->userId.'/files'; |
|
| 113 | 113 | |
| 114 | 114 | return rtrim(substr($path, strlen($prefix)), '/'); |
| 115 | 115 | } |