nextcloud / circles

lib/Db/CoreRequestBuilder.php

Spacing +43 added lines, -43 removed lines

@@ -170,16 +170,16 @@ 
 		$this->generateMemberSelectAlias($alias, self::PREFIX_MEMBER)
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreQueryBuilder::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))
 			)
 		);
 	}
@@ -200,7 +200,7 @@ 
 			 ->leftJoin(
 				 $this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_CIRCLE, $alias,
 				 $expr->andX(
-					 $expr->eq($alias . '.unique_id', $this->getDefaultSelectAlias() . '.circle_id')
+					 $expr->eq($alias.'.unique_id', $this->getDefaultSelectAlias().'.circle_id')
 				 )
 			 );
 
@@ -230,8 +230,8 @@ 
 			 ->leftJoin(
 				 $circleTableAlias, CoreQueryBuilder::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))
 				 )
 			 );
 	}
@@ -264,11 +264,11 @@ 
 			 ->leftJoin(
 				 $aliasCircle, CoreQueryBuilder::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))
 					 )
 				 )
 			 );
@@ -294,9 +294,9 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::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))
 			)
 		);
 	}
@@ -321,17 +321,17 @@ 
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::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(), CoreQueryBuilder::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))
 			)
 		);
 	}
@@ -351,7 +351,7 @@ 
 		$expr = $this->expr();
 		$this->leftJoin(
 			$this->getDefaultSelectAlias(), CoreQueryBuilder::TABLE_REMOTE, $alias,
-			$expr->eq($alias . '.instance', $this->createNamedParameter($instance))
+			$expr->eq($alias.'.instance', $this->createNamedParameter($instance))
 		);
 	}
 
@@ -375,16 +375,16 @@ 
 		// - 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))
 			)
 		);
 		if (!$mustBeMember) {
-			$orX->add($expr->bitwiseAnd($aliasCircle . '.config', Circle::CFG_VISIBLE));
+			$orX->add($expr->bitwiseAnd($aliasCircle.'.config', Circle::CFG_VISIBLE));
 		}
 		$this->andWhere($orX);
 
@@ -420,10 +420,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);
 	}
 
 
@@ -456,16 +456,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') {
@@ -475,8 +475,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);
@@ -485,13 +485,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);
@@ -509,21 +509,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)
 			)
 		);
@@ -538,7 +538,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));
 	}