nextcloud / circles

lib/Command/SharesFiles.php

Spacing +5 added lines, -5 removed lines

@@ -222,7 +222,7 @@ 
 				$recipient = $share->getInitiator();
 				$sharedTo = $recipient->getDisplayName();
 				if (!$this->configService->isLocalInstance($recipient->getInstance())) {
-					$sharedTo .= '@' . $recipient->getInstance();
+					$sharedTo .= '@'.$recipient->getInstance();
 				}
 			}
 			$circle = $share->getCircle();
@@ -232,15 +232,15 @@ 
 				$share->getShareOwner(),
 				$share->getFileTarget(),
 				$share->getSharedBy(),
-				$circle->getDisplayName() . ' (' . $share->getSharedWith()
-				. ', ' . Circle::$DEF_SOURCE[$circle->getSource()] . ')'
+				$circle->getDisplayName().' ('.$share->getSharedWith()
+				. ', '.Circle::$DEF_SOURCE[$circle->getSource()].')'
 			];
 
 			if (!$filterRecipient) {
 				$row = array_merge(
 					$row, [
-							$sharedTo . ' (' . $recipient->getSingleId() . ', '
-							. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()] . ')',
+							$sharedTo.' ('.$recipient->getSingleId().', '
+							. Circle::$DEF_SOURCE[$recipient->getBasedOn()->getSource()].')',
 							(($share->getChildId() > 0) ? $share->getChildFileTarget(
 							) : $share->getFileTarget()),
 						]

lib/Command/CirclesMemberships.php

Spacing +20 added lines, -20 removed lines

@@ -213,10 +213,10 @@ 
 			return 0;
 		}
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$TYPE[$federatedUser->getUserType()] . '</info>');
-		$output->writeln('SingleId: <info>' . $federatedUser->getSingleId() . '</info>');
+		$output->writeln('Id: <info>'.$federatedUser->getUserId().'</info>');
+		$output->writeln('Instance: <info>'.$federatedUser->getInstance().'</info>');
+		$output->writeln('Type: <info>'.Member::$TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 		$output->writeln('');
 		$output->writeln('Memberships:');
@@ -225,14 +225,14 @@ 
 		if ($count === 0) {
 			$output->writeln('(database not updated)');
 		} else {
-			$output->writeln('(' . $count . ' entries generated/updated in the database)');
+			$output->writeln('('.$count.' entries generated/updated in the database)');
 		}
 
 		foreach ($federatedUser->getMemberships() as $membership) {
 			$this->memberships[$membership->getCircleId()] = $membership;
 			$output->writeln(
-				'- <info>' . $membership->getCircleId() . '</info> ('
-				. Member::$DEF_LEVEL[$membership->getLevel()] . ')'
+				'- <info>'.$membership->getCircleId().'</info> ('
+				. Member::$DEF_LEVEL[$membership->getLevel()].')'
 			);
 		}
 
@@ -305,9 +305,9 @@ 
 				if ($lineNumber === 2) {
 					return '';
 				}
-				$line .= '<info>' . $federatedUser->getSingleId() . '</info>';
+				$line .= '<info>'.$federatedUser->getSingleId().'</info>';
 				if (!$this->configService->isLocalInstance($federatedUser->getInstance())) {
-					$line .= '@' . $federatedUser->getInstance();
+					$line .= '@'.$federatedUser->getInstance();
 				}
 
 				return $line;
@@ -319,28 +319,28 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getSingleId() . '</info>';
+					$line .= '<info>'.$circle->getSingleId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . ($this->input->getOption('display-name') ?
-							$circle->getDisplayName() : $circle->getName()) . ')';
-					$line .= ' <info>MemberId</info>: ' . $member->getId();
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.($this->input->getOption('display-name') ?
+							$circle->getDisplayName() : $circle->getName()).')';
+					$line .= ' <info>MemberId</info>: '.$member->getId();
+					$line .= ' <info>Level</info>: '.Member::$DEF_LEVEL[$member->getLevel()];
 
 					$knownMembership = $this->memberships[$member->getCircleId()];
 					if ($member->getLevel() !== $knownMembership->getLevel()) {
-						$line .= ' (' . Member::$DEF_LEVEL[$knownMembership->getLevel()] . ')';
+						$line .= ' ('.Member::$DEF_LEVEL[$knownMembership->getLevel()].')';
 					}
 				}
 				if ($lineNumber === 2) {
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					if ($owner->hasBasedOn()) {
-						$line .= ' (' . Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()] . ') ';
+						$line .= ' ('.Circle::$DEF_SOURCE[$owner->getBasedOn()->getSource()].') ';
 					}
 					$type = implode(", ", Circle::getCircleFlags($circle, Circle::FLAGS_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;
@@ -397,7 +397,7 @@ 
 			);
 		}
 
-		$output->writeln($count . ' memberships updated');
+		$output->writeln($count.' memberships updated');
 	}
 
 }

lib/Service/SyncService.php

Spacing +1 added lines, -1 removed lines

@@ -280,7 +280,7 @@
 	 */
 	public function groupDeleted(string $groupId): void {
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSource(Member::TYPE_GROUP);
 

lib/Service/SharingFrameService.php

Spacing +3 added lines, -3 removed lines

@@ -148,7 +148,7 @@ 
 	public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) {
 
 		$this->miscService->log(
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0
 		);
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
@@ -163,7 +163,7 @@ 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage()
+				'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage()
 			);
 			throw $e;
 		}
@@ -310,7 +310,7 @@ 
 			return true;
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to initialise circle share with request ' . json_encode($request) . ' - '
+				'fail to initialise circle share with request '.json_encode($request).' - '
 				. $e->getMessage(), 3
 			);
 			throw $e;

lib/Service/FederatedUserService.php

Spacing +3 added lines, -3 removed lines

@@ -320,7 +320,7 @@ 
 	public function getLocalFederatedUser(string $userId): FederatedUser {
 		$user = $this->userManager->get($userId);
 		if ($user === null) {
-			throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+			throw new FederatedUserNotFoundException('user '.$userId.' not found');
 		}
 
 		$federatedUser = new FederatedUser();
@@ -721,7 +721,7 @@ 
 			$prefix = ($federatedUser->getUserType() === Member::TYPE_APP) ? 'app'
 				: Member::$TYPE[$federatedUser->getUserType()];
 
-			$circle->setName($prefix . ':' . $federatedUser->getUserId() . ':' . $id)
+			$circle->setName($prefix.':'.$federatedUser->getUserId().':'.$id)
 				   ->setDisplayName($this->getLocalDisplayName($federatedUser))
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -851,7 +851,7 @@ 
 		$owner = $this->getCurrentApp();
 
 		$circle = new Circle();
-		$circle->setName('group:' . $groupId)
+		$circle->setName('group:'.$groupId)
 			   ->setConfig(Circle::CFG_SYSTEM | Circle::CFG_NO_OWNER | Circle::CFG_HIDDEN)
 			   ->setSingleId($this->token(ManagedModel::ID_LENGTH))
 			   ->setSource(Member::TYPE_GROUP);

lib/Controller/LocalController.php

Spacing +1 added lines, -1 removed lines

@@ -194,7 +194,7 @@
 					throw new OCSException('works only from local instance', 404);
 				}
 
-				$userId = $currentUser->getUserId() . '/' . $userId;
+				$userId = $currentUser->getUserId().'/'.$userId;
 			}
 
 			$federatedUser = $this->federatedUserService->generateFederatedUser($userId, $type);

lib/Listeners/Files/MemberAdded.php

Spacing +2 added lines, -2 removed lines

@@ -74,8 +74,8 @@
 			$result[$instance] = $item->gData('files');
 		}
 
-		\OC::$server->getLogger()->log(3, 'FILES: ' . json_encode($result));
-		\OC::$server->getLogger()->log(3, 'MAILS: ' . json_encode($federatedUsers));
+		\OC::$server->getLogger()->log(3, 'FILES: '.json_encode($result));
+		\OC::$server->getLogger()->log(3, 'MAILS: '.json_encode($federatedUsers));
 	}
 
 }

lib/MountManager/CircleMountManager.php

Spacing +1 added lines, -1 removed lines

@@ -109,7 +109,7 @@
 	 * @return string
 	 */
 	protected function stripPath($path) {
-		$prefix = '/' . $this->userId . '/files';
+		$prefix = '/'.$this->userId.'/files';
 
 		return rtrim(substr($path, strlen($prefix)), '/');
 	}

lib/FederatedItems/SingleMemberAdd.php

Spacing +5 added lines, -5 removed lines

@@ -325,10 +325,10 @@ 
 	protected function generateMember(Circle $circle, Member $member): Member {
 		try {
 			if ($member->getSingleId() !== '') {
-				$userId = $member->getSingleId() . '@' . $member->getInstance();
+				$userId = $member->getSingleId().'@'.$member->getInstance();
 				$federatedUser = $this->federatedUserService->getFederatedUser($userId, Member::TYPE_SINGLE);
 			} else {
-				$userId = $member->getUserId() . '@' . $member->getInstance();
+				$userId = $member->getUserId().'@'.$member->getInstance();
 				$federatedUser =
 					$this->federatedUserService->getFederatedUser($userId, $member->getUserType());
 			}
@@ -601,7 +601,7 @@ 
 			$this->sendMailExistingShares($template, $author, $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->miscService->log('Failed to send mail about existing share ' . $e->getMessage());
+			$this->miscService->log('Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -753,7 +753,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->miscService->log("Sending password mail about existing files to '" . $email . "'", 0);
+		$this->miscService->log("Sending password mail about existing files to '".$email."'", 0);
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -795,7 +795,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}