nextcloud / circles

lib/Activity/ProviderParser.php

Spacing +5 added lines, -5 removed lines

@@ -138,7 +138,7 @@ 
 				continue;
 			}
 
-			$replace['{' . $k . '}'] = $data[$k]['_parsed'];
+			$replace['{'.$k.'}'] = $data[$k]['_parsed'];
 		}
 
 		$line = strtr($line, $replace);
@@ -300,9 +300,9 @@ 
 	 */
 	protected function generateExternalMemberParameter(Member $member) {
 		return [
-			'type'    => 'member_' . $member->getType(),
+			'type'    => 'member_'.$member->getType(),
 			'id'      => $member->getUserId(),
-			'name'    => $member->getDisplayName() . ' (' . $member->getTypeString() . ')',
+			'name'    => $member->getDisplayName().' ('.$member->getTypeString().')',
 			'_parsed' => $member->getDisplayName()
 		];
 	}
@@ -338,8 +338,8 @@ 
 		return [
 			'type'    => 'circle',
 			'id'      => $link->getUniqueId(),
-			'name'    => $link->getToken() . '@' . $link->getAddress(),
-			'_parsed' => $link->getToken() . '@' . $link->getAddress()
+			'name'    => $link->getToken().'@'.$link->getAddress(),
+			'_parsed' => $link->getToken().'@'.$link->getAddress()
 		];
 	}
 

lib/Db/CirclesRequestBuilder.php

Spacing +6 added lines, -6 removed lines

@@ -181,7 +181,7 @@ 
 				$expr->eq(
 					$qb->createNamedParameter($circleUniqueId),
 					$qb->createFunction(
-						'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+						'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 					)
 				)
 			);
@@ -252,7 +252,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '`' . $this->default_select_alias . '`.';
+		$pf = '`'.$this->default_select_alias.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -264,7 +264,7 @@ 
 				   $expr->eq(
 					   'u.circle_id',
 					   $qb->createFunction(
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
 						   . ')'
 					   )
 				   ),
@@ -287,7 +287,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = '`' . $this->default_select_alias . '`.';
+		$pf = '`'.$this->default_select_alias.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('o.user_id', 'owner_userid')
@@ -298,7 +298,7 @@ 
 			   $expr->andX(
 				   $expr->eq(
 					   $qb->createFunction(
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH
 						   . ')'
 					   )
 					   , 'o.circle_id'
@@ -359,7 +359,7 @@ 
 			   $qb->expr()
 				  ->eq(
 					  $qb->createFunction(
-						  'SUBSTR(`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+						  'SUBSTR(`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 					  ),
 					  $qb->createNamedParameter($circleUniqueId)
 				  )

lib/Db/CoreRequestBuilder.php

Spacing +22 added lines, -22 removed lines

@@ -140,12 +140,12 @@ 
 	 */
 	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId, $length) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? '`' . $this->default_select_alias . '`.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? '`'.$this->default_select_alias.'`.' : '';
 
 		$qb->andWhere(
 			$expr->eq(
 				$qb->createNamedParameter($circleUniqueId),
-				$qb->createFunction('SUBSTR(' . $pf . '`unique_id`' . ', 1, ' . $length . ')')
+				$qb->createFunction('SUBSTR('.$pf.'`unique_id`'.', 1, '.$length.')')
 			)
 		);
 
@@ -198,8 +198,8 @@ 
 		$expr = $qb->expr();
 
 		if ($pf === '') {
-			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-			$qb->andWhere($expr->gte($p . 'level', $qb->createNamedParameter($level)));
+			$p = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+			$qb->andWhere($expr->gte($p.'level', $qb->createNamedParameter($level)));
 
 			return;
 		}
@@ -227,7 +227,7 @@ 
 			if ($p === 'g' && !$this->leftJoinedNCGroupAndUser) {
 				continue;
 			}
-			$orX->add($expr->gte($p . '.level', $qb->createNamedParameter($level)));
+			$orX->add($expr->gte($p.'.level', $qb->createNamedParameter($level)));
 		}
 
 		return $orX;
@@ -242,12 +242,12 @@ 
 	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$orX = $expr->orX();
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
-		$orX->add($expr->eq($pf . 'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_MEMBER)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_INVITED)));
+		$orX->add($expr->eq($pf.'status', $qb->createNamedParameter(Member::STATUS_REQUEST)));
 
 		$qb->andWhere($orX);
 	}
@@ -260,8 +260,8 @@ 
 	 */
 	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->eq($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->eq($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -272,8 +272,8 @@ 
 	 */
 	private function limitToDBFieldOrGreater(IQueryBuilder &$qb, $field, $value) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
-		$qb->andWhere($expr->gte($pf . $field, $qb->createNamedParameter($value)));
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
+		$qb->andWhere($expr->gte($pf.$field, $qb->createNamedParameter($value)));
 	}
 
 
@@ -288,9 +288,9 @@ 
 	protected function limitToNCGroupUser(IQueryBuilder $qb, $userId = '') {
 		$expr = $qb->expr();
 
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
-		$and = $expr->andX($expr->eq($pf . 'group_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'group_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -311,14 +311,14 @@ 
 	 */
 	protected function rightJoinCircles(IQueryBuilder &$qb) {
 		$expr = $qb->expr();
-		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias . '.' : '';
+		$pf = ($qb->getType() === QueryBuilder::SELECT) ? $this->default_select_alias.'.' : '';
 
 		$qb->from(self::TABLE_CIRCLES, 'c')
 		   ->andWhere(
 			   $expr->eq(
-				   $pf . 'circle_id',
+				   $pf.'circle_id',
 				   $qb->createFunction(
-					   'SUBSTR(`c`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					   'SUBSTR(`c`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				   )
 			   )
 		   );
@@ -338,7 +338,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -346,9 +346,9 @@ 
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
 			   $expr->eq(
-				   $pf . 'circle_id',
+				   $pf.'circle_id',
 				   $qb->createFunction(
-					   'SUBSTR(`lc`.`unique_id`, 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					   'SUBSTR(`lc`.`unique_id`, 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				   )
 			   )
 		   );
@@ -381,7 +381,7 @@ 
 				$expr->eq('ncgu.gid', 'g.group_id'),
 				$expr->eq(
 					'g.circle_id', $qb->createFunction(
-					'SUBSTR(' . $field . ', 1, ' . Circle::SHORT_UNIQUE_ID_LENGTH . ')'
+					'SUBSTR('.$field.', 1, '.Circle::SHORT_UNIQUE_ID_LENGTH.')'
 				)
 				)
 			)

lib/Service/FederatedLinkService.php

Spacing +1 added lines, -1 removed lines

@@ -217,7 +217,7 @@
 	 * @return string
 	 */
 	public function generateLinkRemoteURL($remote) {
-		return $this->configService->generateRemoteHost($remote) . self::REMOTE_URL_LINK;
+		return $this->configService->generateRemoteHost($remote).self::REMOTE_URL_LINK;
 	}