nextcloud / circles

lib/Model/Member.php

Spacing +19 added lines, -19 removed lines

@@ -811,29 +811,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new MemberNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'member_id', $data));
-		$this->setCircleId($this->get($prefix . 'circle_id', $data));
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setLevel($this->getInt($prefix . 'level', $data));
-		$this->setStatus($this->get($prefix . 'status', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setNotes($this->getArray($prefix . 'note', $data));
-		$this->setContactId($this->get($prefix . 'contact_id', $data));
-		$this->setContactMeta($this->get($prefix . 'contact_meta', $data));
-
-		$cachedUpdate = $this->get($prefix . 'cached_update', $data);
+		$this->setId($this->get($prefix.'member_id', $data));
+		$this->setCircleId($this->get($prefix.'circle_id', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setLevel($this->getInt($prefix.'level', $data));
+		$this->setStatus($this->get($prefix.'status', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setNotes($this->getArray($prefix.'note', $data));
+		$this->setContactId($this->get($prefix.'contact_id', $data));
+		$this->setContactMeta($this->get($prefix.'contact_meta', $data));
+
+		$cachedUpdate = $this->get($prefix.'cached_update', $data);
 		if ($cachedUpdate !== '') {
 			$this->setDisplayUpdate(DateTime::createFromFormat('Y-m-d H:i:s', $cachedUpdate)->getTimestamp());
 		}
 
-		$joined = $this->get($prefix . 'joined', $data);
+		$joined = $this->get($prefix.'joined', $data);
 		if ($joined !== '') {
 			$this->setJoined(DateTime::createFromFormat('Y-m-d H:i:s', $joined)->getTimestamp());
 		}
@@ -924,7 +924,7 @@ 
 	public static function parseLevelInt(int $level): int {
 		if (!array_key_exists($level, self::$DEF_LEVEL)) {
 			$all = implode(', ', array_keys(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return $level;
@@ -943,7 +943,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new ParseMemberLevelException('Available levels: ' . $all, 121);
+			throw new ParseMemberLevelException('Available levels: '.$all, 121);
 		}
 
 		return (int)$level;
@@ -964,7 +964,7 @@ 
 		$type = array_search($typeString, Member::$TYPE);
 		if ($type === false) {
 			$all = implode(', ', array_values(self::$TYPE));
-			throw new UserTypeNotFoundException('Available types: ' . $all);
+			throw new UserTypeNotFoundException('Available types: '.$all);
 		}
 
 		return (int)$type;

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -176,7 +176,7 @@ 
 			return $value;
 		}
 
-		if (($value = $this->config->getSystemValue(Application::APP_ID . '.' . $key, '')) !== '') {
+		if (($value = $this->config->getSystemValue(Application::APP_ID.'.'.$key, '')) !== '') {
 			return $value;
 		}
 
@@ -430,7 +430,7 @@ 
 		}
 
 		if (array_key_exists('port', $loopback)) {
-			$loopbackCloudId = $loopback['host'] . ':' . $loopback['port'];
+			$loopbackCloudId = $loopback['host'].':'.$loopback['port'];
 		} else {
 			$loopbackCloudId = $loopback['host'];
 		}
@@ -459,12 +459,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);
 	}
 
 
@@ -561,7 +561,7 @@ 
 	 * @return string
 	 */
 	public function displayFederatedUser(IFederatedUser $federatedUser): string {
-		return $federatedUser->getUserId() . $this->displayInstance($federatedUser->getInstance(), true);
+		return $federatedUser->getUserId().$this->displayInstance($federatedUser->getInstance(), true);
 	}
 
 	/**
@@ -575,7 +575,7 @@ 
 			return '';
 		}
 
-		return (($showAt) ? '@' : '') . $instance;
+		return (($showAt) ? '@' : '').$instance;
 	}
 
 

lib/Service/CircleService.php

Spacing +2 added lines, -2 removed lines

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

lib/Model/Circle.php

Spacing +32 added lines, -32 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;
 
@@ -742,23 +742,23 @@ 
 	 * @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))
-			 ->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))
+			 ->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/Listeners/Examples/AddingExampleCircleMember.php

Spacing +11 added lines, -11 removed lines

@@ -96,13 +96,13 @@ 
 			$circle = $event->getCircle();
 			$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(
+			$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()] . '; ';
+					 . '; singleId: '.$member->getSingleId().'; memberId: '.$member->getId()
+					 . '; isLocal: '.json_encode($member->isLocal()).'; level: '
+					 . Member::$DEF_LEVEL[$member->getLevel()].'; ';
 
 			$memberships = array_map(
 				function(Membership $membership) {
@@ -111,22 +111,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/Service/MaintenanceService.php

Spacing +1 added lines, -1 removed lines

@@ -169,7 +169,7 @@
 	 */
 	private function output(string $message): void {
 		if (!is_null($this->output)) {
-			$this->output->writeln('- ' . $message);
+			$this->output->writeln('- '.$message);
 		}
 	}
 

lib/Model/FederatedUser.php

Spacing +6 added lines, -6 removed lines

@@ -400,15 +400,15 @@
 	 * @throws FederatedUserNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->get($prefix . 'single_id', $data) === '') {
+		if ($this->get($prefix.'single_id', $data) === '') {
 			throw new FederatedUserNotFoundException();
 		}
 
-		$this->setSingleId($this->get($prefix . 'single_id', $data));
-		$this->setUserId($this->get($prefix . 'user_id', $data));
-		$this->setUserType($this->getInt($prefix . 'user_type', $data));
-		$this->setDisplayName($this->get($prefix . 'cached_name', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
+		$this->setSingleId($this->get($prefix.'single_id', $data));
+		$this->setUserId($this->get($prefix.'user_id', $data));
+		$this->setUserType($this->getInt($prefix.'user_type', $data));
+		$this->setDisplayName($this->get($prefix.'cached_name', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
 
 		$this->getManager()->manageImportFromDatabase($this, $data, $prefix);
 

lib/Model/Federated/RemoteInstance.php

Spacing +14 added lines, -14 removed lines

@@ -50,11 +50,11 @@ 
 
 	use TArrayTools;
 
-	const TYPE_UNKNOWN = 'Unknown';    // not trusted
-	const TYPE_PASSIVE = 'Passive';    // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
-	const TYPE_EXTERNAL = 'External';  // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
-	const TYPE_TRUSTED = 'Trusted';    // everything about Federated Circles are broadcasted.
-	const TYPE_GLOBALSCALE = 'GlobalScale';  // every Circle is broadcasted,
+	const TYPE_UNKNOWN = 'Unknown'; // not trusted
+	const TYPE_PASSIVE = 'Passive'; // Minimum information about Federated Circles are broadcasted if a member belongs to the circle.
+	const TYPE_EXTERNAL = 'External'; // info about Federated Circles and their members are broadcasted  if a member belongs to the circle.
+	const TYPE_TRUSTED = 'Trusted'; // everything about Federated Circles are broadcasted.
+	const TYPE_GLOBALSCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -477,7 +477,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		if (!empty($this->getAliases())) {
@@ -496,17 +496,17 @@ 
 	 * @throws RemoteNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC22QueryRow {
-		if ($this->getInt($prefix . 'id', $data) === 0) {
+		if ($this->getInt($prefix.'id', $data) === 0) {
 			throw new RemoteNotFoundException();
 		}
 
-		$this->setDbId($this->getInt($prefix . 'id', $data));
-		$this->import($this->getArray($prefix . 'item', $data));
-		$this->setOrigData($this->getArray($prefix . 'item', $data));
-		$this->setType($this->get($prefix . 'type', $data));
-		$this->setInterface($this->getInt($prefix . 'interface', $data));
-		$this->setInstance($this->get($prefix . 'instance', $data));
-		$this->setId($this->get($prefix . 'href', $data));
+		$this->setDbId($this->getInt($prefix.'id', $data));
+		$this->import($this->getArray($prefix.'item', $data));
+		$this->setOrigData($this->getArray($prefix.'item', $data));
+		$this->setType($this->get($prefix.'type', $data));
+		$this->setInterface($this->getInt($prefix.'interface', $data));
+		$this->setInstance($this->get($prefix.'instance', $data));
+		$this->setId($this->get($prefix.'href', $data));
 
 		return $this;
 	}

lib/Service/FederatedUserService.php

Spacing +3 added lines, -3 removed lines

@@ -394,7 +394,7 @@ 
 		if ($check) {
 			$user = $this->userManager->get($userId);
 			if ($user === null) {
-				throw new FederatedUserNotFoundException('user ' . $userId . ' not found');
+				throw new FederatedUserNotFoundException('user '.$userId.' not found');
 			}
 			$userId = $user->getUID();
 			$displayName = $user->getDisplayName();
@@ -852,7 +852,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($federatedUser->getDisplayName())
 				   ->setSingleId($id)
 				   ->setSource($source);
@@ -976,7 +976,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);