nextcloud / circles

lib/Model/Federated/RemoteInstance.php

Spacing +6 added lines, -6 removed lines

@@ -49,11 +49,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_GLOBAL_SCALE = '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_GLOBAL_SCALE = 'GlobalScale'; // every Circle is broadcasted,
 
 	public static $LIST_TYPE = [
 		self::TYPE_UNKNOWN,
@@ -407,7 +407,7 @@ 
 		];
 
 		if ($this->getAuthSigned() !== '') {
-			$data['auth-signed'] = $this->getAlgorithm() . ':' . $this->getAuthSigned();
+			$data['auth-signed'] = $this->getAlgorithm().':'.$this->getAuthSigned();
 		}
 
 		return array_filter(array_merge($data, parent::jsonSerialize()));

lib/Service/ConfigService.php

Spacing +6 added lines, -6 removed lines

@@ -254,7 +254,7 @@ 
 		if ((!$this->isNonSSLLinksAllowed() || strpos($remote, 'http://') !== 0)
 			&& strpos($remote, 'https://') !== 0
 		) {
-			$remote = 'https://' . $remote;
+			$remote = 'https://'.$remote;
 		}
 
 		return rtrim($remote, '/');
@@ -524,7 +524,7 @@ 
 
 			if ($type !== self::GS_MOCKUP) {
 				throw new GSStatusException(
-					'GS and lookup are not configured : ' . $lookup . ', ' . $enabled
+					'GS and lookup are not configured : '.$lookup.', '.$enabled
 				);
 			}
 		}
@@ -593,7 +593,7 @@ 
 			}
 
 			if (array_key_exists('port', $local)) {
-				return $local['host'] . ':' . $local['port'];
+				return $local['host'].':'.$local['port'];
 			} else {
 				return $local['host'];
 			}
@@ -615,13 +615,13 @@ 
 	 * @return string
 	 */
 	public function getRemotePath(string $route = 'circles.Navigation.navigate', array $args = []): string {
-		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME) . '://' . $this->getLocalInstance();
+		$base = $this->getAppValue(self::LOCAL_CLOUD_SCHEME).'://'.$this->getLocalInstance();
 
 		if ($route === '') {
 			return $base;
 		}
 
-		return $base . $this->urlGenerator->linkToRoute($route, $args);
+		return $base.$this->urlGenerator->linkToRoute($route, $args);
 	}
 
 	/**
@@ -724,7 +724,7 @@ 
 			$ncBase = substr($ncBase, 0, -strlen($forcedPath));
 		}
 
-		return rtrim($ncBase, '/') . $link;
+		return rtrim($ncBase, '/').$link;
 	}
 
 }

lib/Service/RemoteService.php

Spacing +2 added lines, -2 removed lines

@@ -247,7 +247,7 @@ 
 			$loop++;
 			if ($loop > 10 || in_array($instance, $knownInstance)) {
 				throw new CircleNotFoundException(
-					'circle not found after browsing ' . implode(', ', $knownInstance)
+					'circle not found after browsing '.implode(', ', $knownInstance)
 				);
 			}
 			$knownInstance[] = $instance;
@@ -317,7 +317,7 @@ 
 			['type' => Member::$DEF_TYPE[$type], 'userId' => $userId]
 		);
 
-		\OC::$server->getLogger()->log(3, '>> ' . json_encode($result));
+		\OC::$server->getLogger()->log(3, '>> '.json_encode($result));
 		if (empty($result)) {
 			throw new FederatedUserNotFoundException();
 		}

lib/Command/MembersList.php

Spacing +12 added lines, -12 removed lines

@@ -158,11 +158,11 @@ 
 		if ($input->getOption('tree')) {
 			$this->federatedUserService->commandLineInitiator($initiator, $circleId, true);
 			$circle = $this->circleService->getCircle($circleId);
-			$output->writeln('<info>Name</info>: ' . $circle->getName());
+			$output->writeln('<info>Name</info>: '.$circle->getName());
 			$owner = $circle->getOwner();
-			$output->writeln('<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance());
+			$output->writeln('<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance());
 			$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-			$output->writeln('<info>Config</info>: ' . $type);
+			$output->writeln('<info>Config</info>: '.$type);
 			$output->writeln(' ');
 
 			$tree = new NC21TreeNode(null, new SimpleDataStore(['circle' => $circle]));
@@ -184,7 +184,7 @@ 
 		}
 
 		if ($input->getOption('json')) {
-			echo json_encode($members, JSON_PRETTY_PRINT) . "\n";
+			echo json_encode($members, JSON_PRETTY_PRINT)."\n";
 
 			return 0;
 		}
@@ -343,14 +343,14 @@ 
 				$member = $data->gObj('member', Member::class);
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $member->getUserId() . '</info>';
+					$line .= '<info>'.$member->getUserId().'</info>';
 					if (!$this->configService->isLocalInstance($member->getInstance())) {
-						$line .= '@' . $member->getInstance();
+						$line .= '@'.$member->getInstance();
 					}
-					$line .= ' (' . Member::$DEF_LEVEL[$member->getLevel()] . ')';
+					$line .= ' ('.Member::$DEF_LEVEL[$member->getLevel()].')';
 
 					if (!is_null($circle)) {
-						$line .= ' <info>Name</info>: ' . $circle->getName();
+						$line .= ' <info>Name</info>: '.$circle->getName();
 					}
 				}
 
@@ -363,16 +363,16 @@ 
 						return $line;
 					}
 					$owner = $circle->getOwner();
-					$line .= '<info>Owner</info>: ' . $owner->getUserId() . '@' . $owner->getInstance();
+					$line .= '<info>Owner</info>: '.$owner->getUserId().'@'.$owner->getInstance();
 					$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-					$line .= ($type === '') ? '' : ' <info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : ' <info>Config</info>: '.$type;
 				}
 
 			} else {
 				if ($lineNumber === 1 && !is_null($circle)) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
 				}
 			}

lib/Command/CirclesMemberships.php

Spacing +16 added lines, -16 removed lines

@@ -169,10 +169,10 @@ 
 		$type = Member::parseTypeString($input->getOption('type'));
 		$federatedUser = $this->federatedUserService->getFederatedUser($userId, (int)$type);
 
-		$output->writeln('Id: <info>' . $federatedUser->getUserId() . '</info>');
-		$output->writeln('Instance: <info>' . $federatedUser->getInstance() . '</info>');
-		$output->writeln('Type: <info>' . Member::$DEF_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::$DEF_TYPE[$federatedUser->getUserType()].'</info>');
+		$output->writeln('SingleId: <info>'.$federatedUser->getSingleId().'</info>');
 
 
 		$output->writeln('');
@@ -181,14 +181,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()].')'
 			);
 		}
 
@@ -256,9 +256,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;
@@ -270,24 +270,24 @@ 
 				$circle = $member->getCircle();
 
 				if ($lineNumber === 1) {
-					$line .= '<info>' . $circle->getId() . '</info>';
+					$line .= '<info>'.$circle->getId().'</info>';
 					if (!$this->configService->isLocalInstance($circle->getInstance())) {
-						$line .= '@' . $circle->getInstance();
+						$line .= '@'.$circle->getInstance();
 					}
-					$line .= ' (' . $circle->getName() . ')';
-					$line .= ' <info>Level</info>: ' . Member::$DEF_LEVEL[$member->getLevel()];
+					$line .= ' ('.$circle->getName().')';
+					$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().' ';
 					$type = implode(", ", Circle::getCircleTypes($circle, Circle::TYPES_LONG));
-					$line .= ($type === '') ? '' : '<info>Config</info>: ' . $type;
+					$line .= ($type === '') ? '' : '<info>Config</info>: '.$type;
 				}
 
 				return $line;

lib/Db/CoreQueryBuilder.php

Spacing +66 added lines, -66 removed lines

@@ -163,16 +163,16 @@ 
 		$this->generateMemberSelectAlias($alias, self::PREFIX_MEMBER)
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
-				 $expr->eq($alias . '.circle_id', $this->getDefaultSelectAlias() . '.unique_id')
+				 $expr->eq($alias.'.circle_id', $this->getDefaultSelectAlias().'.unique_id')
 			 );
 
 		// TODO: Check in big table if it is better to put condition in andWhere() or in LeftJoin()
 		$this->andWhere(
 			$expr->andX(
-				$expr->eq($alias . '.user_id', $this->createNamedParameter($member->getUserId())),
-				$expr->eq($alias . '.user_type', $this->createNamedParameter($member->getUserType())),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($this->getInstance($member))),
-				$expr->gte($alias . '.level', $this->createNamedParameter($level))
+				$expr->eq($alias.'.user_id', $this->createNamedParameter($member->getUserId())),
+				$expr->eq($alias.'.user_type', $this->createNamedParameter($member->getUserType())),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($this->getInstance($member))),
+				$expr->gte($alias.'.level', $this->createNamedParameter($level))
 			)
 		);
 	}
@@ -193,7 +193,7 @@ 
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_CIRCLE, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.unique_id', $this->getDefaultSelectAlias() . '.circle_id')
+					 $expr->eq($alias.'.unique_id', $this->getDefaultSelectAlias().'.circle_id')
 				 )
 			 );
 
@@ -223,8 +223,8 @@ 
 			 ->leftJoin(
 				 $circleTableAlias, CoreRequestBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $circleTableAlias . '.unique_id'),
-					 $expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+					 $expr->eq($alias.'.circle_id', $circleTableAlias.'.unique_id'),
+					 $expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 				 )
 			 );
 	}
@@ -250,11 +250,11 @@ 
 			 ->leftJoin(
 				 $aliasCircle, CoreRequestBuilder::TABLE_MEMBER, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-					 $expr->eq($alias . '.user_id', $this->createNamedParameter($initiator->getUserId())),
-					 $expr->eq($alias . '.user_type', $this->createNamedParameter($initiator->getUserType())),
+					 $expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+					 $expr->eq($alias.'.user_id', $this->createNamedParameter($initiator->getUserId())),
+					 $expr->eq($alias.'.user_type', $this->createNamedParameter($initiator->getUserType())),
 					 $expr->eq(
-						 $alias . '.instance', $this->createNamedParameter($this->getInstance($initiator))
+						 $alias.'.instance', $this->createNamedParameter($this->getInstance($initiator))
 					 )
 				 )
 			 );
@@ -280,9 +280,9 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $aliasCircle . '.unique_id'),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($instance)),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.circle_id', $aliasCircle.'.unique_id'),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($instance)),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -307,17 +307,17 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.single_id', $aliasCircle . '.unique_id'),
-				$expr->emptyString($alias . '.instance'),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.single_id', $aliasCircle.'.unique_id'),
+				$expr->emptyString($alias.'.instance'),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $aliasRemoteOwner,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $aliasRemoteOwner . '.circle_id'),
-				$expr->eq($aliasRemoteOwner . '.instance', $this->createNamedParameter($instance)),
-				$expr->eq($aliasRemoteOwner . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+				$expr->eq($alias.'.circle_id', $aliasRemoteOwner.'.circle_id'),
+				$expr->eq($aliasRemoteOwner.'.instance', $this->createNamedParameter($instance)),
+				$expr->eq($aliasRemoteOwner.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
 	}
@@ -337,7 +337,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_REMOTE, $alias,
-			$expr->eq($alias . '.instance', $this->createNamedParameter($instance))
+			$expr->eq($alias.'.instance', $this->createNamedParameter($instance))
 		);
 	}
 
@@ -356,15 +356,15 @@ 
 		// - 4 (Visible to everyone)
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->andX($expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
+			$expr->andX($expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER)))
 		);
 		$orX->add(
 			$expr->andX(
-				$expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_PERSONAL),
-				$expr->eq($alias . '.level', $this->createNamedParameter(Member::LEVEL_OWNER))
+				$expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_PERSONAL),
+				$expr->eq($alias.'.level', $this->createNamedParameter(Member::LEVEL_OWNER))
 			)
 		);
-		$orX->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_VISIBLE));
+		$orX->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_VISIBLE));
 		$this->andWhere($orX);
 
 
@@ -399,10 +399,10 @@ 
 		$expr = $this->expr();
 
 		$orHidden = $expr->orX();
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_SINGLE));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_HIDDEN));
-		$orHidden->add($expr->bitwiseAnd($alias . '.config', Circle::CFG_BACKEND));
-		$this->andWhere($this->createFunction('NOT') . $orHidden);
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_SINGLE));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_HIDDEN));
+		$orHidden->add($expr->bitwiseAnd($alias.'.config', Circle::CFG_BACKEND));
+		$this->andWhere($this->createFunction('NOT').$orHidden);
 	}
 
 
@@ -435,16 +435,16 @@ 
 
 		$orX = $expr->orX();
 		$orX->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_GLOBAL_SCALE))
 		);
 
 		$orExtOrPassive = $expr->orX();
 		$orExtOrPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_EXTERNAL))
 		);
 		if (!$sensitive) {
 			$orExtOrPassive->add(
-				$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+				$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 			);
 		} else {
 			if ($this->getDefaultSelectAlias() === 'm') {
@@ -454,8 +454,8 @@ 
 
 
 		$orInstance = $expr->orX();
-		$orInstance->add($expr->isNotNull($aliasMembers . '.instance'));
-		$orInstance->add($expr->isNotNull($aliasRemoteOwner . '.instance'));
+		$orInstance->add($expr->isNotNull($aliasMembers.'.instance'));
+		$orInstance->add($expr->isNotNull($aliasRemoteOwner.'.instance'));
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
@@ -464,13 +464,13 @@ 
 		$orExtOrTrusted = $expr->orX();
 		$orExtOrTrusted->add($andExternal);
 		$orExtOrTrusted->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_TRUSTED))
 		);
 
 		$andTrusted = $expr->andX();
 		$andTrusted->add($orExtOrTrusted);
-		$andTrusted->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_FEDERATED));
-		$andTrusted->add($expr->emptyString($aliasOwner . '.instance'));
+		$andTrusted->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_FEDERATED));
+		$andTrusted->add($expr->emptyString($aliasOwner.'.instance'));
 		$orX->add($andTrusted);
 
 		$this->andWhere($orX);
@@ -488,21 +488,21 @@ 
 		$expr = $this->expr();
 		$andPassive = $expr->andX();
 		$andPassive->add(
-			$expr->eq($alias . '.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
+			$expr->eq($alias.'.type', $this->createNamedParameter(RemoteInstance::TYPE_PASSIVE))
 		);
 
 		$orMemberOrLevel = $expr->orX();
 		$orMemberOrLevel->add(
-			$expr->eq($this->getDefaultSelectAlias() . '.instance', $alias . '.instance')
+			$expr->eq($this->getDefaultSelectAlias().'.instance', $alias.'.instance')
 		);
 		// TODO: do we need this ? (display members from the local instance)
 		$orMemberOrLevel->add(
-			$expr->emptyString($this->getDefaultSelectAlias() . '.instance')
+			$expr->emptyString($this->getDefaultSelectAlias().'.instance')
 		);
 
 		$orMemberOrLevel->add(
 			$expr->eq(
-				$this->getDefaultSelectAlias() . '.level',
+				$this->getDefaultSelectAlias().'.level',
 				$this->createNamedParameter(Member::LEVEL_OWNER)
 			)
 		);
@@ -516,7 +516,7 @@ 
 	 * @param int $flag
 	 */
 	public function filterConfig(int $flag): void {
-		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias() . '.config', $flag));
+		$this->andWhere($this->expr()->bitwiseAnd($this->getDefaultSelectAlias().'.config', $flag));
 	}
 
 
@@ -527,15 +527,15 @@ 
 	 * @return $this
 	 */
 	private function generateCircleSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.unique_id', $prefix . 'unique_id')
-			 ->selectAlias($alias . '.name', $prefix . 'name')
-			 ->selectAlias($alias . '.alt_name', $prefix . 'alt_name')
-			 ->selectAlias($alias . '.description', $prefix . 'description')
-			 ->selectAlias($alias . '.settings', $prefix . 'settings')
-			 ->selectAlias($alias . '.config', $prefix . 'config')
-			 ->selectAlias($alias . '.contact_addressbook', $prefix . 'contact_addressbook')
-			 ->selectAlias($alias . '.contact_groupname', $prefix . 'contact_groupname')
-			 ->selectAlias($alias . '.creation', $prefix . 'creation');
+		$this->selectAlias($alias.'.unique_id', $prefix.'unique_id')
+			 ->selectAlias($alias.'.name', $prefix.'name')
+			 ->selectAlias($alias.'.alt_name', $prefix.'alt_name')
+			 ->selectAlias($alias.'.description', $prefix.'description')
+			 ->selectAlias($alias.'.settings', $prefix.'settings')
+			 ->selectAlias($alias.'.config', $prefix.'config')
+			 ->selectAlias($alias.'.contact_addressbook', $prefix.'contact_addressbook')
+			 ->selectAlias($alias.'.contact_groupname', $prefix.'contact_groupname')
+			 ->selectAlias($alias.'.creation', $prefix.'creation');
 
 		return $this;
 	}
@@ -547,20 +547,20 @@ 
 	 * @return $this
 	 */
 	private function generateMemberSelectAlias(string $alias, string $prefix): self {
-		$this->selectAlias($alias . '.circle_id', $prefix . 'circle_id')
-			 ->selectAlias($alias . '.single_id', $prefix . 'single_id')
-			 ->selectAlias($alias . '.user_id', $prefix . 'user_id')
-			 ->selectAlias($alias . '.user_type', $prefix . 'user_type')
-			 ->selectAlias($alias . '.member_id', $prefix . 'member_id')
-			 ->selectAlias($alias . '.instance', $prefix . 'instance')
-			 ->selectAlias($alias . '.cached_name', $prefix . 'cached_name')
-			 ->selectAlias($alias . '.cached_update', $prefix . 'cached_update')
-			 ->selectAlias($alias . '.status', $prefix . 'status')
-			 ->selectAlias($alias . '.level', $prefix . 'level')
-			 ->selectAlias($alias . '.note', $prefix . 'note')
-			 ->selectAlias($alias . '.contact_id', $prefix . 'contact_id')
-			 ->selectAlias($alias . '.contact_meta', $prefix . 'contact_meta')
-			 ->selectAlias($alias . '.joined', $prefix . 'joined');
+		$this->selectAlias($alias.'.circle_id', $prefix.'circle_id')
+			 ->selectAlias($alias.'.single_id', $prefix.'single_id')
+			 ->selectAlias($alias.'.user_id', $prefix.'user_id')
+			 ->selectAlias($alias.'.user_type', $prefix.'user_type')
+			 ->selectAlias($alias.'.member_id', $prefix.'member_id')
+			 ->selectAlias($alias.'.instance', $prefix.'instance')
+			 ->selectAlias($alias.'.cached_name', $prefix.'cached_name')
+			 ->selectAlias($alias.'.cached_update', $prefix.'cached_update')
+			 ->selectAlias($alias.'.status', $prefix.'status')
+			 ->selectAlias($alias.'.level', $prefix.'level')
+			 ->selectAlias($alias.'.note', $prefix.'note')
+			 ->selectAlias($alias.'.contact_id', $prefix.'contact_id')
+			 ->selectAlias($alias.'.contact_meta', $prefix.'contact_meta')
+			 ->selectAlias($alias.'.joined', $prefix.'joined');
 
 		return $this;
 	}

lib/Db/MemberRequest.php

Spacing +2 added lines, -2 removed lines

@@ -174,8 +174,8 @@
 			$qb->limitToRemoteInstance($remoteInstance->getInstance(), true);
 		}
 
-		$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);
 	}

lib/Model/Circle.php

Spacing +27 added lines, -27 removed lines

@@ -82,23 +82,23 @@ 
 
 
 	// 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 Circl (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_ROOT = 4096;        // Circle cannot be inside another Circle
-	const CFG_FEDERATED = 8192;   // Federated
+	const CFG_SYSTEM = 4; // System Circl (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_ROOT = 4096; // Circle cannot be inside another Circle
+	const CFG_FEDERATED = 8192; // Federated
 
 
 	public static $DEF_CFG_MAX = 16383;
@@ -628,21 +628,21 @@ 
 	 * @throws CircleNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'unique_id', $data)) {
+		if (!array_key_exists($prefix.'unique_id', $data)) {
 			throw new CircleNotFoundException();
 		}
 
-		$this->setId($this->get($prefix . 'unique_id', $data))
-			 ->setName($this->get($prefix . 'name', $data))
-			 ->setAltName($this->get($prefix . 'alt_name', $data))
-			 ->setConfig($this->getInt($prefix . 'config', $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->setId($this->get($prefix.'unique_id', $data))
+			 ->setName($this->get($prefix.'name', $data))
+			 ->setAltName($this->get($prefix.'alt_name', $data))
+			 ->setConfig($this->getInt($prefix.'config', $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()->importOwnerFromDatabase($this, $data);

lib/Command/CirclesConfig.php

Spacing +2 added lines, -2 removed lines

@@ -182,8 +182,8 @@
 			$value = array_search(strtoupper($item), $valid);
 			if (!$value) {
 				throw new InvalidArgumentException(
-					'Invalid config \'' . $item . '\'. Available values: '
-					. implode(', ', array_values($valid)) . '. '
+					'Invalid config \''.$item.'\'. Available values: '
+					. implode(', ', array_values($valid)).'. '
 					. 'To disable a config, start the value with an underscore'
 				);
 			}