nextcloud / circles

lib/Db/CoreQueryBuilder.php

Spacing +55 added lines, -55 removed lines

@@ -162,16 +162,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))
 			)
 		);
 	}
@@ -192,7 +192,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')
 				 )
 			 );
 
@@ -222,8 +222,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))
 				 )
 			 );
 	}
@@ -249,11 +249,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))
 					 )
 				 )
 			 );
@@ -276,9 +276,9 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreRequestBuilder::TABLE_MEMBER, $alias,
 			$expr->andX(
-				$expr->eq($alias . '.circle_id', $this->getDefaultSelectAlias() . '.unique_id'),
-				$expr->eq($alias . '.instance', $this->createNamedParameter($instance)),
-				$expr->gte($alias . '.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
+				$expr->eq($alias.'.circle_id', $this->getDefaultSelectAlias().'.unique_id'),
+				$expr->eq($alias.'.instance', $this->createNamedParameter($instance)),
+				$expr->gte($alias.'.level', $this->createNamedParameter(Member::LEVEL_MEMBER))
 			)
 		);
 	}
@@ -298,7 +298,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))
 		);
 	}
 
@@ -317,15 +317,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);
 
 
@@ -360,10 +360,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);
 	}
 
 
@@ -392,33 +392,33 @@ 
 
 		$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))
 			);
 		}
 
 		$andExternal = $expr->andX();
 		$andExternal->add($orExtOrPassive);
-		$andExternal->add($expr->isNotNull($aliasMembers . '.instance'));
+		$andExternal->add($expr->isNotNull($aliasMembers.'.instance'));
 
 		$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);
@@ -429,7 +429,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));
 	}
 
 
@@ -440,15 +440,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;
 	}
@@ -460,20 +460,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/Model/Member.php

Spacing +17 added lines, -17 removed lines

@@ -548,29 +548,29 @@ 
 	 * @throws MemberNotFoundException
 	 */
 	public function importFromDatabase(array $data, string $prefix = ''): INC21QueryRow {
-		if (!array_key_exists($prefix . 'member_id', $data)) {
+		if (!array_key_exists($prefix.'member_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->setCachedName($this->get($prefix . 'cached_name', $data));
-		$this->setNote($this->get($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->setCachedName($this->get($prefix.'cached_name', $data));
+		$this->setNote($this->get($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->setCachedUpdate(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());
 		}
@@ -599,7 +599,7 @@ 
 
 		if (!$level) {
 			$all = implode(', ', array_values(self::$DEF_LEVEL));
-			throw new MemberLevelException('Available levels: ' . $all);
+			throw new MemberLevelException('Available levels: '.$all);
 		}
 
 		return (int)$level;

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,
 
 	const TEST = 'test';
 	const INCOMING = 'incoming';
@@ -399,7 +399,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()));