nextcloud / circles

lib/FederatedItems/SingleMemberAdd.php

Spacing +5 added lines, -5 removed lines

@@ -336,11 +336,11 @@ 
 	protected function generateMember(FederatedEvent $event, 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()
@@ -642,7 +642,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());
 		}
 	}
 
@@ -794,7 +794,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 email with a link to access them.\n",
@@ -836,7 +836,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();
 		}

lib/Service/CircleService.php

Spacing +2 added lines, -2 removed lines

@@ -496,7 +496,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testDisplayName = $baseDisplayName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testDisplayName = $baseDisplayName.(($i > 1) ? ' ('.$i.')' : '');
 			$test = new Circle();
 			$test->setDisplayName($testDisplayName);
 
@@ -529,7 +529,7 @@ 
 
 		$i = 1;
 		while (true) {
-			$testSanitizedName = $baseSanitizedName . (($i > 1) ? ' (' . $i . ')' : '');
+			$testSanitizedName = $baseSanitizedName.(($i > 1) ? ' ('.$i.')' : '');
 
 			$test = new Circle();
 			$test->setSanitizedName($testSanitizedName);

lib/Listeners/Examples/ExampleAddingCircleMember.php

Spacing +11 added lines, -11 removed lines

@@ -89,12 +89,12 @@ 
 
 		$eventType = ($event->getType() === CircleGenericEvent::INVITED) ? 'invited' : 'joined';
 
-		$info = 'A new member have been added (' . $eventType . ') to a Circle. ';
+		$info = 'A new member have been added ('.$eventType.') to a Circle. ';
 
-		$info .= 'userId: ' . $member->getUserId() . '; userType: ' . Member::$TYPE[$member->getUserType()]
-				 . '; singleId: ' . $member->getSingleId() . '; memberId: ' . $member->getId()
-				 . '; isLocal: ' . json_encode($member->isLocal()) . '; level: '
-				 . Member::$DEF_LEVEL[$member->getLevel()] . '; ';
+		$info .= 'userId: '.$member->getUserId().'; userType: '.Member::$TYPE[$member->getUserType()]
+				 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
+				 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
+				 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
 
 		$memberships = array_map(
 			function(Membership $membership) {
@@ -103,22 +103,22 @@ 
 		);
 
 		$listMemberships = (count($memberships) > 0) ? implode(', ', $memberships) : 'none';
-		$info .= 'circleName: ' . $circle->getDisplayName() . '; circleId: ' . $circle->getSingleId()
-				 . '; Circle memberships: ' . $listMemberships . '.';
+		$info .= 'circleName: '.$circle->getDisplayName().'; circleId: '.$circle->getSingleId()
+				 . '; Circle memberships: '.$listMemberships.'.';
 
 		if ($member->getUserType() === Member::TYPE_CIRCLE) {
 			$basedOn = $member->getBasedOn();
 			$members = array_map(
 				function(Member $member) {
-					return $member->getUserId() . ' (' . Member::$TYPE[$member->getUserType()] . ')';
+					return $member->getUserId().' ('.Member::$TYPE[$member->getUserType()].')';
 				}, $basedOn->getInheritedMembers()
 			);
 
-			$info .= ' Member is a Circle (singleId: ' . $basedOn->getSingleId()
-					 . ') that contains those inherited members: ' . implode(', ', $members);
+			$info .= ' Member is a Circle (singleId: '.$basedOn->getSingleId()
+					 . ') that contains those inherited members: '.implode(', ', $members);
 		}
 
-		$this->log(3, $prefix . $info);
+		$this->log(3, $prefix.$info);
 	}
 
 }

lib/Listeners/Examples/ExampleRequestingCircleMember.php

Spacing +4 added lines, -4 removed lines

@@ -91,11 +91,11 @@
 
 		$circle = $event->getCircle();
 		$member = $event->getMember();
-		$info .= 'circleId: ' . $circle->getSingleId() . '; userId: ' . $member->getUserId() . '; userType: '
-				 . Member::$TYPE[$member->getUserType()] . '; singleId: ' . $member->getSingleId()
-				 . '; memberId: ' . $member->getId() . '; isLocal: ' . json_encode($member->isLocal()) . '; ';
+		$info .= 'circleId: '.$circle->getSingleId().'; userId: '.$member->getUserId().'; userType: '
+				 . Member::$TYPE[$member->getUserType()].'; singleId: '.$member->getSingleId()
+				 . '; memberId: '.$member->getId().'; isLocal: '.json_encode($member->isLocal()).'; ';
 
-		$this->log(3, $prefix . $info);
+		$this->log(3, $prefix.$info);
 	}
 
 }

lib/Db/MemberRequest.php

Spacing +6 added lines, -6 removed lines

@@ -239,8 +239,8 @@ 
 			$qb->filterDirectMembership(CoreQueryBuilder::MEMBER, $filter);
 		}
 
-		$qb->orderBy($qb->getDefaultSelectAlias() . '.level', 'desc');
-		$qb->addOrderBy($qb->getDefaultSelectAlias() . '.cached_name', 'asc');
+		$qb->orderBy($qb->getDefaultSelectAlias().'.level', 'desc');
+		$qb->addOrderBy($qb->getDefaultSelectAlias().'.cached_name', 'asc');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -265,8 +265,8 @@ 
 		$qb->limitToMembersByInheritance(CoreQueryBuilder::MEMBER, $singleId, $level);
 
 		$aliasMembership = $qb->generateAlias(CoreQueryBuilder::MEMBER, CoreQueryBuilder::MEMBERSHIPS);
-		$qb->orderBy($aliasMembership . '.inheritance_depth', 'asc')
-		   ->addGroupBy($aliasMembership . '.inheritance_depth');
+		$qb->orderBy($aliasMembership.'.inheritance_depth', 'asc')
+		   ->addGroupBy($aliasMembership.'.inheritance_depth');
 
 		return $this->getItemsFromRequest($qb);
 	}
@@ -308,7 +308,7 @@ 
 		$qb = $this->getMemberSelectSql();
 		$qb->limitToCircleId($circleId);
 
-		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER . '.instance'));
+		$qb->andwhere($qb->expr()->nonEmptyString(CoreQueryBuilder::MEMBER.'.instance'));
 
 		return array_map(
 			function(Member $member): string {
@@ -361,7 +361,7 @@ 
 	 */
 	public function searchFederatedUsers(string $needle): array {
 		$qb = $this->getMemberSelectSql();
-		$qb->searchInDBField('user_id', '%' . $needle . '%');
+		$qb->searchInDBField('user_id', '%'.$needle.'%');
 
 		return $this->getItemsFromRequest($qb, true);
 	}

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -186,7 +186,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -440,7 +440,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -469,12 +469,12 @@ 
 			$scheme = $this->getAppValue(self::LOOPBACK_CLOUD_SCHEME);
 		}
 
-		$base = $scheme . '://' . $instance;
+		$base = $scheme.'://'.$instance;
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 
@@ -574,7 +574,7 @@ 
 	public function displayFederatedUser(IFederatedUser $federatedUser, bool $displayName = false): string {
 		$name = ($displayName) ? $federatedUser->getDisplayName() : $federatedUser->getUserId();
 
-		return $name . $this->displayInstance($federatedUser->getInstance(), true);
+		return $name.$this->displayInstance($federatedUser->getInstance(), true);
 	}
 
 	/**
@@ -588,7 +588,7 @@ 
 			return '';
 		}
 
-		return (($showAt) ? '@' : '') . $instance;
+		return (($showAt) ? '@' : '').$instance;
 	}
 
 

lib/Model/Circle.php

Spacing +33 added lines, -33 removed lines

@@ -84,26 +84,26 @@ 
 
 
 	// specific value
-	const CFG_CIRCLE = 0;        // only for code readability. Circle is locked by default.
-	const CFG_SINGLE = 1;        // Circle with only one single member.
-	const CFG_PERSONAL = 2;      // Personal circle, only the owner can see it.
+	const CFG_CIRCLE = 0; // only for code readability. Circle is locked by default.
+	const CFG_SINGLE = 1; // Circle with only one single member.
+	const CFG_PERSONAL = 2; // Personal circle, only the owner can see it.
 
 	// bitwise
-	const CFG_SYSTEM = 4;            // System Circle (not managed by the official front-end). Meaning some config are limited
-	const CFG_VISIBLE = 8;           // Visible to everyone, if not visible, people have to know its name to be able to find it
-	const CFG_OPEN = 16;             // Circle is open, people can join
-	const CFG_INVITE = 32;           // Adding a member generate an invitation that needs to be accepted
-	const CFG_REQUEST = 64;          // Request to join Circles needs to be confirmed by a moderator
-	const CFG_FRIEND = 128;          // Members of the circle can invite their friends
-	const CFG_PROTECTED = 256;       // Password protected to join/request
-	const CFG_NO_OWNER = 512;        // no owner, only members
-	const CFG_HIDDEN = 1024;         // hidden from listing, but available as a share entity
-	const CFG_BACKEND = 2048;            // Fully hidden, only backend Circles
-	const CFG_LOCAL = 4096;              // Local even on GlobalScale
-	const CFG_ROOT = 8192;               // Circle cannot be inside another Circle
-	const CFG_CIRCLE_INVITE = 16384;     // Circle must confirm when invited in another circle
-	const CFG_FEDERATED = 32768;         // Federated
-	const CFG_MOUNTPOINT = 65536;        // Generate a Files folder for this Circle
+	const CFG_SYSTEM = 4; // System Circle (not managed by the official front-end). Meaning some config are limited
+	const CFG_VISIBLE = 8; // Visible to everyone, if not visible, people have to know its name to be able to find it
+	const CFG_OPEN = 16; // Circle is open, people can join
+	const CFG_INVITE = 32; // Adding a member generate an invitation that needs to be accepted
+	const CFG_REQUEST = 64; // Request to join Circles needs to be confirmed by a moderator
+	const CFG_FRIEND = 128; // Members of the circle can invite their friends
+	const CFG_PROTECTED = 256; // Password protected to join/request
+	const CFG_NO_OWNER = 512; // no owner, only members
+	const CFG_HIDDEN = 1024; // hidden from listing, but available as a share entity
+	const CFG_BACKEND = 2048; // Fully hidden, only backend Circles
+	const CFG_LOCAL = 4096; // Local even on GlobalScale
+	const CFG_ROOT = 8192; // Circle cannot be inside another Circle
+	const CFG_CIRCLE_INVITE = 16384; // Circle must confirm when invited in another circle
+	const CFG_FEDERATED = 32768; // Federated
+	const CFG_MOUNTPOINT = 65536; // Generate a Files folder for this Circle
 
 	public static $DEF_CFG_MAX = 131071;
 
@@ -763,24 +763,24 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'unique_id', $data) === '') {
+		if ($this->get($prefix.'unique_id', $data) === '') {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setDisplayName($this->get($prefix . 'display_name', $data))
-			 ->setSanitizedName($this->get($prefix . 'sanitized_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $data))
-			 ->setSource($this->getInt($prefix . 'source', $data))
-			 ->setInstance($this->get($prefix . 'instance', $data))
-			 ->setPopulation($this->getInt($prefix . 'population', $data))
-			 ->setSettings($this->getArray($prefix . 'settings', $data))
-			 ->setContactAddressBook($this->getInt($prefix . 'contact_addressbook', $data))
-			 ->setContactGroupName($this->get($prefix . 'contact_groupname', $data))
-			 ->setDescription($this->get($prefix . 'description', $data));
-
-		$creation = $this->get($prefix . 'creation', $data);
+		$this->setSingleId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setDisplayName($this->get($prefix.'display_name', $data))
+			 ->setSanitizedName($this->get($prefix.'sanitized_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $data))
+			 ->setSource($this->getInt($prefix.'source', $data))
+			 ->setInstance($this->get($prefix.'instance', $data))
+			 ->setPopulation($this->getInt($prefix.'population', $data))
+			 ->setSettings($this->getArray($prefix.'settings', $data))
+			 ->setContactAddressBook($this->getInt($prefix.'contact_addressbook', $data))
+			 ->setContactGroupName($this->get($prefix.'contact_groupname', $data))
+			 ->setDescription($this->get($prefix.'description', $data));
+
+		$creation = $this->get($prefix.'creation', $data);
 		$this->setCreation(DateTime::createFromFormat('Y-m-d H:i:s', $creation)->getTimestamp());
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);

lib/Service/SyncService.php

Spacing +3 added lines, -3 removed lines

@@ -250,7 +250,7 @@ 
 	 * @throws SingleCircleNotFoundException
 	 */
 	public function syncNextcloudUser(string $userId): FederatedUser {
-		$this->outputService->output('Syncing Nextcloud User \'' . $userId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud User \''.$userId.'\'', true);
 
 		return $this->federatedUserService->getLocalFederatedUser($userId);
 	}
@@ -294,7 +294,7 @@ 
 	 * @throws RequestBuilderException
 	 */
 	public function syncNextcloudGroup(string $groupId): Circle {
-		$this->outputService->output('Syncing Nextcloud Group \'' . $groupId . '\'', true);
+		$this->outputService->output('Syncing Nextcloud Group \''.$groupId.'\'', true);
 
 		$circle = $this->federatedUserService->getGroupCircle($groupId);
 		$group = $this->groupManager->get($groupId);
@@ -363,7 +363,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/OutputService.php

Spacing +3 added lines, -3 removed lines

@@ -82,14 +82,14 @@
 	 */
 	public function output(string $message, bool $advance = false): void {
 		if (!is_null($this->occOutput)) {
-			$this->occOutput->writeln((($advance) ? '+' : '-') . ' ' . $message);
+			$this->occOutput->writeln((($advance) ? '+' : '-').' '.$message);
 		}
 
 		if (!is_null($this->migrationOutput)) {
 			if ($advance) {
-				$this->migrationOutput->advance(1, '(Circles) ' . $message);
+				$this->migrationOutput->advance(1, '(Circles) '.$message);
 			} else {
-				$this->migrationOutput->info('(Circles) ' . $message);
+				$this->migrationOutput->info('(Circles) '.$message);
 			}
 		}
 	}