nextcloud / circles

lib/Db/CoreRequestBuilder.php

Spacing +30 added lines, -30 removed lines

@@ -71,7 +71,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $id
 	 */
-	protected function limitToId(IQueryBuilder &$qb, $id) {
+	protected function limitToId(IQueryBuilder & $qb, $id) {
 		$this->limitToDBField($qb, 'id', $id);
 	}
 
@@ -82,7 +82,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $uniqueId
 	 */
-	protected function limitToUniqueId(IQueryBuilder &$qb, $uniqueId) {
+	protected function limitToUniqueId(IQueryBuilder & $qb, $uniqueId) {
 		$this->limitToDBField($qb, 'unique_id', $uniqueId);
 	}
 
@@ -93,7 +93,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $token
 	 */
-	protected function limitToToken(IQueryBuilder &$qb, $token) {
+	protected function limitToToken(IQueryBuilder & $qb, $token) {
 		$this->limitToDBField($qb, 'token', $token);
 	}
 
@@ -106,7 +106,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserId(IQueryBuilder &$qb, $userId) {
+	protected function limitToUserId(IQueryBuilder & $qb, $userId) {
 		$this->limitToDBField($qb, 'user_id', $userId);
 	}
 
@@ -120,7 +120,7 @@ 
 	 *
 	 * @internal param int $circleId
 	 */
-	protected function limitToUserType(IQueryBuilder &$qb, $type) {
+	protected function limitToUserType(IQueryBuilder & $qb, $type) {
 		$this->limitToDBField($qb, 'user_type', $type);
 	}
 
@@ -132,7 +132,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $circleUniqueId
 	 */
-	protected function limitToCircleId(IQueryBuilder &$qb, $circleUniqueId) {
+	protected function limitToCircleId(IQueryBuilder & $qb, $circleUniqueId) {
 		$this->limitToDBField($qb, 'circle_id', $circleUniqueId);
 	}
 
@@ -143,15 +143,15 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $circleUniqueId
 	 */
-	protected function limitToShortenUniqueId(IQueryBuilder &$qb, $circleUniqueId) {
+	protected function limitToShortenUniqueId(IQueryBuilder & $qb, $circleUniqueId) {
 		$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, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR('.$pf.'`unique_id`'.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 			)
 		);
@@ -165,7 +165,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param int $groupId
 	 */
-	protected function limitToGroupId(IQueryBuilder &$qb, $groupId) {
+	protected function limitToGroupId(IQueryBuilder & $qb, $groupId) {
 		$this->limitToDBField($qb, 'group_id', $groupId);
 	}
 
@@ -176,7 +176,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $name
 	 */
-	protected function limitToName(IQueryBuilder &$qb, $name) {
+	protected function limitToName(IQueryBuilder & $qb, $name) {
 		$this->limitToDBField($qb, 'name', $name);
 	}
 
@@ -188,12 +188,12 @@ 
 	 * @param int $level
 	 * @param string|array $pf
 	 */
-	protected function limitToLevel(IQueryBuilder &$qb, $level, $pf = '') {
+	protected function limitToLevel(IQueryBuilder & $qb, $level, $pf = '') {
 		$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;
 		}
@@ -208,7 +208,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)));
 		}
 
 		$qb->andWhere($orX);
@@ -220,15 +220,15 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToMembersAndAlmost(IQueryBuilder &$qb) {
+	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);
 	}
@@ -239,10 +239,10 @@ 
 	 * @param string $field
 	 * @param string|integer $value
 	 */
-	private function limitToDBField(IQueryBuilder &$qb, $field, $value) {
+	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)));
 	}
 
 
@@ -257,9 +257,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 {
@@ -278,15 +278,15 @@ 
 	 *
 	 * @deprecated not used (14/07/17)
 	 */
-	protected function rightJoinCircles(IQueryBuilder &$qb) {
+	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',
-				   $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')')
+				   $pf.'circle_id',
+				   $qb->createFunction('SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')')
 			   )
 		   );
 	}
@@ -317,7 +317,7 @@ 
 				$expr->eq('ncgu.gid', 'g.group_id'),
 				$expr->eq(
 					'g.circle_id', $qb->createFunction(
-					'SUBSTR(' . $field . ', 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+					'SUBSTR('.$field.', 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				)
 				)
 			)

lib/Service/CirclesService.php

Spacing +8 added lines, -8 removed lines

@@ -195,7 +195,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleMembers(Circle &$circle) {
+	private function detailsCircleMembers(Circle & $circle) {
 		$members =
 			$this->membersRequest->getMembers($circle->getUniqueId(), $circle->getHigherViewer());
 
@@ -208,7 +208,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleLinkedGroups(Circle &$circle) {
+	private function detailsCircleLinkedGroups(Circle & $circle) {
 		$groups = [];
 		if ($this->configService->isLinkedGroupsAllowed()) {
 			$groups =
@@ -226,7 +226,7 @@ 
 	 *
 	 * @param Circle $circle
 	 */
-	private function detailsCircleFederatedCircles(Circle &$circle) {
+	private function detailsCircleFederatedCircles(Circle & $circle) {
 		$links = [];
 
 		try {
@@ -407,23 +407,23 @@ 
 		switch ($type) {
 			case Circle::CIRCLES_PERSONAL:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'personal' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'personal'.$ext)
 				);
 			case Circle::CIRCLES_CLOSED:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'closed' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'closed'.$ext)
 				);
 			case Circle::CIRCLES_SECRET:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'secret' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'secret'.$ext)
 				);
 			case Circle::CIRCLES_PUBLIC:
 				return $urlGen->getAbsoluteURL(
-					$urlGen->imagePath(Application::APP_NAME, 'public' . $ext)
+					$urlGen->imagePath(Application::APP_NAME, 'public'.$ext)
 				);
 		}
 
-		return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle' . $ext));
+		return $urlGen->getAbsoluteURL($urlGen->imagePath(Application::APP_NAME, 'black_circle'.$ext));
 	}
 
 }
\ No newline at end of file

lib/Controller/FederatedController.php

Spacing +1 added lines, -1 removed lines

@@ -225,7 +225,7 @@
 	 * @return DataResponse
 	 */
 	private function federatedFail($reason) {
-		$this->miscService->log(2, 'federated fail: ' . $reason);
+		$this->miscService->log(2, 'federated fail: '.$reason);
 
 		return new DataResponse(
 			[

lib/Service/MiscService.php

Spacing +1 added lines, -1 removed lines

@@ -227,7 +227,7 @@
 		ob_start();
 		echo($result);
 		$size = ob_get_length();
-		header('Content-Length: ' . $size);
+		header('Content-Length: '.$size);
 		ob_end_flush();
 		flush();
 	}

lib/Db/CirclesRequestBuilder.php

Spacing +16 added lines, -16 removed lines

@@ -67,7 +67,7 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $field
 	 */
-	protected function leftJoinGroups(IQueryBuilder &$qb, $field) {
+	protected function leftJoinGroups(IQueryBuilder & $qb, $field) {
 		$expr = $qb->expr();
 
 		$qb->leftJoin(
@@ -81,7 +81,7 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function limitToNonPersonalCircle(IQueryBuilder &$qb) {
+	protected function limitToNonPersonalCircle(IQueryBuilder & $qb) {
 		$expr = $qb->expr();
 
 		$qb->andWhere(
@@ -100,7 +100,7 @@ 
 	 * @throws ConfigNoCircleAvailableException
 	 */
 	protected function limitRegardingCircleType(
-		IQueryBuilder &$qb, $userId, $circleUniqueId, $type, $name
+		IQueryBuilder & $qb, $userId, $circleUniqueId, $type, $name
 	) {
 		$orTypes = $this->generateLimit($qb, $circleUniqueId, $userId, $type, $name);
 		if (sizeof($orTypes) === 0) {
@@ -130,7 +130,7 @@ 
 	 *
 	 * @return array
 	 */
-	private function generateLimit(IQueryBuilder &$qb, $circleUniqueId, $userId, $type, $name) {
+	private function generateLimit(IQueryBuilder & $qb, $circleUniqueId, $userId, $type, $name) {
 		$orTypes = [];
 		array_push($orTypes, $this->generateLimitPersonal($qb, $userId, $type));
 		array_push($orTypes, $this->generateLimitSecret($qb, $circleUniqueId, $type, $name));
@@ -182,7 +182,7 @@ 
 				$expr->eq(
 					$qb->createNamedParameter($circleUniqueId),
 					$qb->createFunction(
-						'SUBSTR(`c`.`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+						'SUBSTR(`c`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 					)
 				)
 			);
@@ -246,14 +246,14 @@ 
 	 * @param IQueryBuilder $qb
 	 * @param string $userId
 	 */
-	protected function leftJoinUserIdAsViewer(IQueryBuilder &$qb, $userId) {
+	protected function leftJoinUserIdAsViewer(IQueryBuilder & $qb, $userId) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = '`' . $this->default_select_alias . '`.';
+		$pf = '`'.$this->default_select_alias.'`.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('u.user_id', 'viewer_userid')
@@ -265,7 +265,7 @@ 
 				   $expr->eq(
 					   'u.circle_id',
 					   $qb->createFunction(
-						   'SUBSTR(' . $pf . '`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH
 						   . ')'
 					   )
 				   ),
@@ -280,14 +280,14 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinOwner(IQueryBuilder &$qb) {
+	protected function leftJoinOwner(IQueryBuilder & $qb) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$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::UNIQUEID_SHORT_LENGTH
+						   'SUBSTR('.$pf.'`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH
 						   . ')'
 					   )
 					   , 'o.circle_id'
@@ -315,14 +315,14 @@ 
 	 *
 	 * @param IQueryBuilder $qb
 	 */
-	protected function leftJoinCircle(IQueryBuilder &$qb) {
+	protected function leftJoinCircle(IQueryBuilder & $qb) {
 
 		if ($qb->getType() !== QueryBuilder::SELECT) {
 			return;
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -330,9 +330,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::UNIQUEID_SHORT_LENGTH . ')'
+					   'SUBSTR(`lc`.`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 				   )
 			   )
 		   );
@@ -459,7 +459,7 @@ 
 			   $qb->expr()
 				  ->eq(
 					  $qb->createFunction(
-						  'SUBSTR(`unique_id`, 1, ' . Circle::UNIQUEID_SHORT_LENGTH . ')'
+						  'SUBSTR(`unique_id`, 1, '.Circle::UNIQUEID_SHORT_LENGTH.')'
 					  ),
 					  $qb->createNamedParameter($circleUniqueId)
 				  )

lib/Circles/FileSharingBroadcaster.php

Spacing +1 added lines, -1 removed lines

@@ -244,7 +244,7 @@
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			$text . "\n " . $this->l10n->t('Click the button below to open it.'), $text
+			$text."\n ".$this->l10n->t('Click the button below to open it.'), $text
 		);
 		$emailTemplate->addBodyButton($this->l10n->t('Open »%s«', [$fileName]), $link);
 

lib/Service/BroadcastService.php

Spacing +2 added lines, -2 removed lines

@@ -134,7 +134,7 @@ 
 	/**
 	 * @param Member $member
 	 */
-	private function parseMember(Member &$member) {
+	private function parseMember(Member & $member) {
 		$this->parseMemberFromContact($member);
 	}
 
@@ -145,7 +145,7 @@ 
 	 *
 	 * @param Member $member
 	 */
-	private function parseMemberFromContact(Member &$member) {
+	private function parseMemberFromContact(Member & $member) {
 
 		if ($member->getType() !== Member::TYPE_CONTACT) {
 			return;

lib/Service/MembersService.php

Spacing +4 added lines, -4 removed lines

@@ -145,7 +145,7 @@ 
 	}
 
 
-	private function addMemberBasedOnItsType(Circle $circle, Member &$member) {
+	private function addMemberBasedOnItsType(Circle $circle, Member & $member) {
 		$this->addLocalMember($circle, $member);
 		$this->addEmailAddress($member);
 		$this->addContact($member);
@@ -191,7 +191,7 @@ 
 //			throw new NoUserException($this->l10n->t("This user does not exist"));
 //		}
 
-		$ident = $this->userId . ':' . $ident;
+		$ident = $this->userId.':'.$ident;
 	}
 
 
@@ -363,7 +363,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function editMemberLevel(Circle $circle, Member &$member, $level) {
+	private function editMemberLevel(Circle $circle, Member & $member, $level) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeModerator();
@@ -387,7 +387,7 @@ 
 	 *
 	 * @throws \Exception
 	 */
-	private function switchOwner(Circle $circle, Member &$member) {
+	private function switchOwner(Circle $circle, Member & $member) {
 		try {
 			$isMod = $circle->getHigherViewer();
 			$isMod->hasToBeOwner();

lib/Service/SearchService.php

Spacing +1 added lines, -1 removed lines

@@ -88,7 +88,7 @@
 			$searcher = \OC::$server->query((string)$container);
 
 			if (!($searcher instanceof ISearch)) {
-				$this->miscService->log('Search ' . $container . ' is not compatible exception');
+				$this->miscService->log('Search '.$container.' is not compatible exception');
 				continue;
 			}