nextcloud / circles

lib/GlobalScale/GlobalSync.php

Spacing +3 added lines, -3 removed lines

@@ -116,13 +116,13 @@ 
 				}
 
 				$this->miscService->log(
-					'updating member :' . json_encode($member) . ' from ' . json_encode($knownMember), 2
+					'updating member :'.json_encode($member).' from '.json_encode($knownMember), 2
 				);
 				$this->membersRequest->updateMemberLevel($member);
 			} catch (MemberDoesNotExistException $e) {
 				try {
 					$this->miscService->log(
-						'creating member :' . json_encode($member), 2
+						'creating member :'.json_encode($member), 2
 					);
 					$this->membersRequest->createMember($member);
 				} catch (MemberAlreadyExistsException $e) {
@@ -140,7 +140,7 @@ 
 			try {
 				$this->getMember($knownItem, $circle->getMembers(), $source);
 			} catch (MemberDoesNotExistException $e) {
-				$this->miscService->log('removing deprecated member :' . json_encode($knownItem), 2);
+				$this->miscService->log('removing deprecated member :'.json_encode($knownItem), 2);
 				$this->membersRequest->removeMember($knownItem);
 				$this->gsSharesRequest->removeGSSharesFromMember($knownItem);
 			}

lib/Service/GSUpstreamService.php

Spacing +3 added lines, -3 removed lines

@@ -150,7 +150,7 @@ 
 			}
 		} catch (Exception $e) {
 			$this->miscService->log(
-				get_class($e) . ' on new event: ' . $e->getMessage() . ' - ' . json_encode($event), 1
+				get_class($e).' on new event: '.$e->getMessage().' - '.json_encode($event), 1
 			);
 			throw $e;
 		}
@@ -246,13 +246,13 @@ 
 		$request->setDataSerialize($event);
 
 		$result = $this->retrieveJson($request);
-		$this->miscService->log('result ' . json_encode($result), 0);
+		$this->miscService->log('result '.json_encode($result), 0);
 		if ($this->getInt('status', $result) === 0) {
 			throw new GlobalScaleEventException($this->get('error', $result));
 		}
 
 		$updatedData = $this->getArray('event', $result);
-		$this->miscService->log('updatedEvent: ' . json_encode($updatedData), 0);
+		$this->miscService->log('updatedEvent: '.json_encode($updatedData), 0);
 		if (!empty($updatedData)) {
 			$updated = new GSEvent();
 			try {

lib/Controller/SharesController.php

Spacing +3 added lines, -3 removed lines

@@ -132,7 +132,7 @@ 
 	 */
 	public function create($circleUniqueId, $source, $type, $payload) {
 
-		$this->miscService->log('Creating circle share: ' . $circleUniqueId, 0);
+		$this->miscService->log('Creating circle share: '.$circleUniqueId, 0);
 
 		try {
 			$share = new SharingFrame($source, $type);
@@ -140,7 +140,7 @@ 
 
 			$this->sharingFrameService->createFrame($circleUniqueId, $share);
 		} catch (\Exception $e) {
-			$this->miscService->log('Failed to create circle - ' . $e->getMessage(), 3);
+			$this->miscService->log('Failed to create circle - '.$e->getMessage(), 3);
 
 			return $this->fail(
 				[
@@ -153,7 +153,7 @@ 
 			);
 		}
 
-		$this->miscService->log('Created circle: share ' . $circleUniqueId, 0);
+		$this->miscService->log('Created circle: share '.$circleUniqueId, 0);
 
 		return $this->success(
 			[

lib/Command/CirclesTest.php

Spacing +5 added lines, -5 removed lines

@@ -135,9 +135,9 @@ 
 		$test->setAsync(true);
 		$token = $this->gsUpstreamService->newEvent($test);
 
-		$output->writeln('- Async request is sent, now waiting ' . $this->delay . ' seconds');
+		$output->writeln('- Async request is sent, now waiting '.$this->delay.' seconds');
 		sleep($this->delay);
-		$output->writeln('- Pause is over, checking results for ' . $token);
+		$output->writeln('- Pause is over, checking results for '.$token);
 
 		$wrappers = $this->gsUpstreamService->getEventsByToken($token);
 
@@ -147,7 +147,7 @@ 
 		}
 
 		foreach ($instances as $instance) {
-			$output->write($instance . ' ');
+			$output->write($instance.' ');
 			if (array_key_exists($instance, $result)
 				&& $result[$instance]->getResult()
 									 ->gInt('status') === 1) {
@@ -172,7 +172,7 @@ 
 	 */
 	private function testLocalAddress(OutputInterface $output): bool {
 		$absolute = $this->urlGenerator->linkToRouteAbsolute('core.CSRFToken.index');
-		$output->write('- Simple request on ' . $absolute . ': ');
+		$output->write('- Simple request on '.$absolute.': ');
 
 		$request = new NC19Request('', Request::TYPE_GET);
 		$this->configService->configureRequest($request);
@@ -183,7 +183,7 @@ 
 		if ($request->getResultCode() === 200) {
 			$color = 'info';
 		}
-		$output->writeln('<' . $color . '>' . $request->getResultCode() . '</' . $color . '>');
+		$output->writeln('<'.$color.'>'.$request->getResultCode().'</'.$color.'>');
 
 		if ($request->getResultCode() === 200) {
 			return true;

lib/Service/SharingFrameService.php

Spacing +5 added lines, -5 removed lines

@@ -153,7 +153,7 @@ 
 	public function createFrame($circleUniqueId, SharingFrame $frame, $broadcast = null) {
 
 		$this->miscService->log(
-			'Create frame with payload ' . json_encode($frame->getPayload()) . ' as ' . $this->userId, 0
+			'Create frame with payload '.json_encode($frame->getPayload()).' as '.$this->userId, 0
 		);
 		try {
 			$circle = $this->circlesRequest->getCircle($circleUniqueId, $this->userId);
@@ -168,7 +168,7 @@ 
 			$this->initiateShare($circle->getUniqueId(), $frame->getUniqueId());
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to create frame for circle ' . $circleUniqueId . ' - ' . $e->getMessage()
+				'fail to create frame for circle '.$circleUniqueId.' - '.$e->getMessage()
 			);
 			throw $e;
 		}
@@ -318,7 +318,7 @@ 
 			return true;
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to initialise circle share with request ' . json_encode($request) . ' - '
+				'fail to initialise circle share with request '.json_encode($request).' - '
 				. $e->getMessage(), 3
 			);
 			throw $e;
@@ -332,7 +332,7 @@ 
 	 * @return string
 	 */
 	private function generatePayloadDeliveryURL($remote) {
-		return $this->configService->generateRemoteHost($remote) .
+		return $this->configService->generateRemoteHost($remote).
 			   $this->urlGenerator->linkToRoute('circles.Shares.initShareDelivery');
 	}
 
@@ -407,7 +407,7 @@ 
 
 		} catch (Exception $e) {
 			$this->miscService->log(
-				'fail to send frame to ' . $link->getAddress() . ' - ' . $e->getMessage()
+				'fail to send frame to '.$link->getAddress().' - '.$e->getMessage()
 			);
 		}
 	}

lib/Api/v1/Circles.php

Spacing +5 added lines, -5 removed lines

@@ -463,7 +463,7 @@ 
 	 */
 	public static function generateLink($circleUniqueId) {
 		return OC::$server->getURLGenerator()
-						  ->linkToRoute('circles.Navigation.navigate') . '#' . $circleUniqueId;
+						  ->linkToRoute('circles.Navigation.navigate').'#'.$circleUniqueId;
 	}
 
 
@@ -478,7 +478,7 @@ 
 	 */
 	public static function generateAbsoluteLink($circleUniqueId) {
 		return OC::$server->getURLGenerator()
-						  ->linkToRouteAbsolute('circles.Navigation.navigate') . '#' . $circleUniqueId;
+						  ->linkToRouteAbsolute('circles.Navigation.navigate').'#'.$circleUniqueId;
 	}
 
 
@@ -493,8 +493,8 @@ 
 	 */
 	public static function generateRemoteLink(FederatedLink $link) {
 		return OC::$server->getURLGenerator()
-						  ->linkToRoute('circles.Navigation.navigate') . '#' . $link->getUniqueId()
-			   . '-' . $link->getToken();
+						  ->linkToRoute('circles.Navigation.navigate').'#'.$link->getUniqueId()
+			   . '-'.$link->getToken();
 	}
 
 
@@ -505,7 +505,7 @@ 
 	 */
 	public static function generateUserParameter(SharingFrame $frame) {
 		if ($frame->getCloudId() !== null) {
-			$name = $frame->getAuthor() . '@' . $frame->getCloudId();
+			$name = $frame->getAuthor().'@'.$frame->getCloudId();
 		} else {
 			try {
 				$membersService = \OC::$server->query(MembersService::class);

lib/Circles/FileSharingBroadcaster.php

Spacing +12 added lines, -12 removed lines

@@ -132,7 +132,7 @@ 
 			$this->miscService = OC::$server->query(MiscService::class);
 		} catch (QueryException $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - ' . $e->getMessage());
+					   ->log(1, 'Circles: cannot init FileSharingBroadcaster - '.$e->getMessage());
 		}
 
 		try {
@@ -325,7 +325,7 @@ 
 	 * @throws IllegalIDChangeException
 	 */
 	private function generateShare($data): IShare {
-		$this->logger->log(0, 'Regenerate shares from payload: ' . json_encode($data));
+		$this->logger->log(0, 'Regenerate shares from payload: '.json_encode($data));
 
 		$share = new Share($this->rootFolder, $this->userManager);
 		$share->setId($data['id']);
@@ -418,7 +418,7 @@ 
 			$this->sendPasswordByMail($share, $displayName, $email, $password);
 		} catch (Exception $e) {
 			OC::$server->getLogger()
-					   ->log(1, 'Circles::sharedByMail - mail were not sent: ' . $e->getMessage());
+					   ->log(1, 'Circles::sharedByMail - mail were not sent: '.$e->getMessage());
 		}
 	}
 
@@ -436,8 +436,8 @@ 
 		$message = $this->mailer->createMessage();
 
 		$this->logger->log(
-			0, "Sending mail to circle '" . $circleName . "': " . $email . ' file: ' . $fileName
-			   . ' - link: ' . $link
+			0, "Sending mail to circle '".$circleName."': ".$email.' file: '.$fileName
+			   . ' - link: '.$link
 		);
 
 		$subject = $this->l10n->t('%s shared »%s« with you.', [$author, $fileName]);
@@ -476,7 +476,7 @@ 
 
 		$message = $this->mailer->createMessage();
 
-		$this->logger->log(0, "Sending password mail to circle '" . $circleName . "': " . $email);
+		$this->logger->log(0, "Sending password mail to circle '".$circleName."': ".$email);
 
 		$filename = $share->getNode()
 						  ->getName();
@@ -531,7 +531,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($initiatorEmailAddress !== null) {
 			$message->setReplyTo([$initiatorEmailAddress => $initiatorDisplayName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -566,7 +566,7 @@ 
 		$emailTemplate->addHeader();
 		$emailTemplate->addHeading($subject, false);
 		$emailTemplate->addBodyText(
-			htmlspecialchars($text) . '<br>' . htmlspecialchars(
+			htmlspecialchars($text).'<br>'.htmlspecialchars(
 				$this->l10n->t('Click the button below to open it.')
 			), $text
 		);
@@ -612,7 +612,7 @@ 
 			$this->sendMailExistingShares($template, $author->getCachedName(), $recipient);
 			$this->sendPasswordExistingShares($author, $recipient, $password);
 		} catch (Exception $e) {
-			$this->logger->log(2, 'Failed to send mail about existing share ' . $e->getMessage());
+			$this->logger->log(2, 'Failed to send mail about existing share '.$e->getMessage());
 		}
 	}
 
@@ -635,7 +635,7 @@ 
 		$authorName = ($authorUser instanceof IUser) ? $authorUser->getDisplayName() : $author;
 		$authorEmail = ($authorUser instanceof IUser) ? $authorUser->getEMailAddress() : null;
 
-		$this->logger->log(0, "Sending password mail about existing files to '" . $email . "'");
+		$this->logger->log(0, "Sending password mail about existing files to '".$email."'");
 
 		$plainBodyPart = $this->l10n->t(
 			"%1\$s shared multiple files with you.\nYou should have already received a separate mail with a link to access them.\n",
@@ -677,7 +677,7 @@ 
 		$message->setFrom([\OCP\Util::getDefaultEmailAddress($instanceName) => $senderName]);
 		if ($authorEmail !== null) {
 			$message->setReplyTo([$authorEmail => $authorName]);
-			$emailTemplate->addFooter($instanceName . ' - ' . $this->defaults->getSlogan());
+			$emailTemplate->addFooter($instanceName.' - '.$this->defaults->getSlogan());
 		} else {
 			$emailTemplate->addFooter();
 		}
@@ -722,7 +722,7 @@ 
 	 */
 	protected function generateMailExitingShares($author, $circleName) {
 		$this->logger->log(
-			0, "Generating mail about existing share mail from '" . $author . "' in "
+			0, "Generating mail about existing share mail from '".$author."' in "
 			   . $circleName
 		);
 

lib/Db/CoreRequestBuilder.php

Spacing +15 added lines, -15 removed lines

@@ -346,8 +346,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;
 		}
@@ -376,7 +376,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;
@@ -391,12 +391,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);
 	}
@@ -409,8 +409,8 @@ 
 	 */
 	public 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)));
 	}
 
 
@@ -421,8 +421,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)));
 	}
 
 
@@ -437,9 +437,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 . 'user_id', 'ncgu.gid'));
+		$and = $expr->andX($expr->eq($pf.'user_id', 'ncgu.gid'));
 		if ($userId !== '') {
 			$and->add($expr->eq('ncgu.uid', $qb->createNamedParameter($userId)));
 		} else {
@@ -462,7 +462,7 @@ 
 		}
 
 		$expr = $qb->expr();
-		$pf = $this->default_select_alias . '.';
+		$pf = $this->default_select_alias.'.';
 
 		/** @noinspection PhpMethodParametersCountMismatchInspection */
 		$qb->selectAlias('lc.type', 'circle_type')
@@ -471,7 +471,7 @@ 
 		   ->selectAlias('lc.settings', 'circle_settings')
 		   ->leftJoin(
 			   $this->default_select_alias, CoreRequestBuilder::TABLE_CIRCLES, 'lc',
-			   $expr->eq($pf . 'circle_id', 'lc.unique_id')
+			   $expr->eq($pf.'circle_id', 'lc.unique_id')
 		   );
 	}
 

lib/Service/GlobalScaleService.php

Spacing +6 added lines, -6 removed lines

@@ -167,12 +167,12 @@ 
 		try {
 			$gs = OC::$server->query($class);
 			if (!$gs instanceof AGlobalScaleEvent) {
-				throw new GlobalScaleEventException($class . ' not an AGlobalScaleEvent');
+				throw new GlobalScaleEventException($class.' not an AGlobalScaleEvent');
 			}
 
 			return $gs;
 		} catch (QueryException $e) {
-			throw new GlobalScaleEventException('AGlobalScaleEvent ' . $class . ' not found');
+			throw new GlobalScaleEventException('AGlobalScaleEvent '.$class.' not found');
 		}
 	}
 
@@ -191,7 +191,7 @@ 
 			}
 		}
 
-		return md5('gskey:' . $key);
+		return md5('gskey:'.$key);
 	}
 
 	/**
@@ -238,7 +238,7 @@ 
 				$instances = $this->retrieveJson($request);
 			} catch (RequestContentException | RequestNetworkException | RequestResultSizeException | RequestServerException | RequestResultNotJsonException $e) {
 				$this->miscService->log(
-					'Issue while retrieving instances from lookup: ' . get_class($e) . ' ' . $e->getMessage()
+					'Issue while retrieving instances from lookup: '.get_class($e).' '.$e->getMessage()
 				);
 
 				return [];
@@ -268,7 +268,7 @@ 
 		$absolute = $this->urlGenerator->linkToRouteAbsolute('circles.Navigation.navigate');
 		$local = parse_url($absolute);
 
-		return [$local['host'] . ':' . $local['port']];
+		return [$local['host'].':'.$local['port']];
 	}
 
 
@@ -282,7 +282,7 @@ 
 		$className = $event->getType();
 		if (substr($className, 0, 25) !== '\OCA\Circles\GlobalScale\\' || strpos($className, '.')) {
 			throw new GlobalScaleEventException(
-				$className . ' does not seems to be a secured AGlobalScaleEvent'
+				$className.' does not seems to be a secured AGlobalScaleEvent'
 			);
 		}