@@ -186,11 +186,11 @@ discard block |
||
186 | 186 | $this->federatedUserService->commandLineInitiator($initiator, $initiatorType, $circleId, true); |
187 | 187 | $circle = $this->circleService->getCircle($circleId); |
188 | 188 | |
189 | - $output->writeln('<info>Name</info>: ' . $circle->getName()); |
|
189 | + $output->writeln('<info>Name</info>: '.$circle->getName()); |
|
190 | 190 | $owner = $circle->getOwner(); |
191 | - $output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance()); |
|
191 | + $output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance()); |
|
192 | 192 | $type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG)); |
193 | - $output->writeln('<info>Config</info>: ' . $type); |
|
193 | + $output->writeln('<info>Config</info>: '.$type); |
|
194 | 194 | $output->writeln(' '); |
195 | 195 | |
196 | 196 | $tree = new NC22TreeNode(null, new SimpleDataStore(['circle' => $circle])); |
@@ -254,8 +254,7 @@ discard block |
||
254 | 254 | ($this->input->getOption('display-name')) ? |
255 | 255 | $member->getDisplayName() : $member->getUserId(), |
256 | 256 | $this->configService->displayInstance($member->getInstance()), |
257 | - ($level > 0) ? Member::$DEF_LEVEL[$level] : |
|
258 | - '(' . strtolower($member->getStatus()) . ')', |
|
257 | + ($level > 0) ? Member::$DEF_LEVEL[$level] : '('.strtolower($member->getStatus()).')', |
|
259 | 258 | ($member->hasInvitedBy()) ? $this->configService->displayFederatedUser( |
260 | 259 | $member->getInvitedBy() |
261 | 260 | ) : 'Unknown' |
@@ -417,18 +416,18 @@ discard block |
||
417 | 416 | $member = $data->gObj('member', Member::class); |
418 | 417 | |
419 | 418 | if ($lineNumber === 1) { |
420 | - $line .= '<info>' . $member->getSingleId() . '</info>'; |
|
419 | + $line .= '<info>'.$member->getSingleId().'</info>'; |
|
421 | 420 | if (!$this->configService->isLocalInstance($member->getInstance())) { |
422 | - $line .= '@' . $member->getInstance(); |
|
421 | + $line .= '@'.$member->getInstance(); |
|
423 | 422 | } |
424 | - $line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')'; |
|
423 | + $line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')'; |
|
425 | 424 | |
426 | - $line .= ' <info>MemberId</info>: ' . $member->getId(); |
|
425 | + $line .= ' <info>MemberId</info>: '.$member->getId(); |
|
427 | 426 | $name = ($this->input->getOption('display-name')) ? |
428 | 427 | $member->getDisplayName() : $member->getUserId(); |
429 | - $line .= ' <info>Name</info>: ' . $name; |
|
428 | + $line .= ' <info>Name</info>: '.$name; |
|
430 | 429 | $source = ($member->hasBasedOn()) ? $member->getBasedOn()->getSource() : ''; |
431 | - $line .= ' <info>Source</info>: ' . Circle::$DEF_SOURCE[$source]; |
|
430 | + $line .= ' <info>Source</info>: '.Circle::$DEF_SOURCE[$source]; |
|
432 | 431 | } |
433 | 432 | |
434 | 433 | if ($lineNumber === 2) { |
@@ -440,16 +439,16 @@ discard block |
||
440 | 439 | return $line; |
441 | 440 | } |
442 | 441 | $owner = $circle->getOwner(); |
443 | - $line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance(); |
|
442 | + $line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance(); |
|
444 | 443 | $type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG)); |
445 | - $line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type; |
|
444 | + $line .= ($type === '') ? '' : ' <info>Config</info>: '.$type; |
|
446 | 445 | } |
447 | 446 | |
448 | 447 | } else { |
449 | 448 | if ($lineNumber === 1 && !is_null($circle)) { |
450 | - $line .= '<info>' . $circle->getSingleId() . '</info>'; |
|
449 | + $line .= '<info>'.$circle->getSingleId().'</info>'; |
|
451 | 450 | if (!$this->configService->isLocalInstance($circle->getInstance())) { |
452 | - $line .= '@' . $circle->getInstance(); |
|
451 | + $line .= '@'.$circle->getInstance(); |
|
453 | 452 | } |
454 | 453 | } |
455 | 454 | } |
@@ -336,11 +336,11 @@ discard block |
||
336 | 336 | protected function generateMember(FederatedEvent $event, Circle $circle, Member $member): Member { |
337 | 337 | try { |
338 | 338 | if ($member->getSingleId() !== '') { |
339 | - $userId = $member->getSingleId() . '@' . $member->getInstance(); |
|
339 | + $userId = $member->getSingleId().'@'.$member->getInstance(); |
|
340 | 340 | $federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE); |
341 | 341 | |
342 | 342 | } else { |
343 | - $userId = $member->getUserId() . '@' . $member->getInstance(); |
|
343 | + $userId = $member->getUserId().'@'.$member->getInstance(); |
|
344 | 344 | $federatedUser = $this->federatedUserService->getFederatedUser( |
345 | 345 | $userId, |
346 | 346 | $member->getUserType() |
@@ -642,7 +642,7 @@ discard block |
||
642 | 642 | $this->sendMailExistingShares($template, $author, $recipient); |
643 | 643 | $this->sendPasswordExistingShares($author, $recipient, $password); |
644 | 644 | } catch (Exception $e) { |
645 | - $this->miscService->log('Failed to send mail about existing share ' . $e->getMessage()); |
|
645 | + $this->miscService->log('Failed to send mail about existing share '.$e->getMessage()); |
|
646 | 646 | } |
647 | 647 | } |
648 | 648 | |
@@ -794,7 +794,7 @@ discard block |
||
794 | 794 | $authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author; |
795 | 795 | $authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null; |
796 | 796 | |
797 | - $this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0); |
|
797 | + $this->miscService->log("Sending password mail about existing files to '".$email."'", 0); |
|
798 | 798 | |
799 | 799 | $plainBodyPart = $this->l10n->t( |
800 | 800 | "%1\$s shared multiple files with you.\nYou should have already received a separate email with a link to access them.\n", |
@@ -836,7 +836,7 @@ discard block |
||
836 | 836 | $message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]); |
837 | 837 | if ($authorEmail !== null) { |
838 | 838 | $message->setReplyTo([$authorEmail => $authorName]); |
839 | - $emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan()); |
|
839 | + $emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan()); |
|
840 | 840 | } else { |
841 | 841 | $emailTemplate->addFooter(); |
842 | 842 | } |
@@ -108,7 +108,7 @@ discard block |
||
108 | 108 | '<error>WARNING! You are about to delete all data related to the Circles App!</error>' |
109 | 109 | ); |
110 | 110 | $question = new ConfirmationQuestion( |
111 | - '<comment>Do you really want to ' . $action . ' Circles ?</comment> (y/N) ', false, '/^(y|Y)/i' |
|
111 | + '<comment>Do you really want to '.$action.' Circles ?</comment> (y/N) ', false, '/^(y|Y)/i' |
|
112 | 112 | ); |
113 | 113 | |
114 | 114 | $helper = $this->getHelper('question'); |
@@ -123,7 +123,7 @@ discard block |
||
123 | 123 | |
124 | 124 | |
125 | 125 | $question = new Question( |
126 | - '<comment>Please confirm this destructive operation by typing \'' . $action |
|
126 | + '<comment>Please confirm this destructive operation by typing \''.$action |
|
127 | 127 | . '\'</comment>: ', '' |
128 | 128 | ); |
129 | 129 | |
@@ -140,7 +140,7 @@ discard block |
||
140 | 140 | $this->coreQueryBuilder->uninstall(); |
141 | 141 | } |
142 | 142 | |
143 | - $output->writeln('<info>' . $action . ' done</info>'); |
|
143 | + $output->writeln('<info>'.$action.' done</info>'); |
|
144 | 144 | |
145 | 145 | return 0; |
146 | 146 | } |