nextcloud / server

apps/federation/lib/SyncJob.php

Spacing +1 added lines, -1 removed lines

@@ -24,7 +24,7 @@
 	}
 
 	protected function run($argument) {
-		$this->syncService->syncThemAll(function ($url, $ex): void {
+		$this->syncService->syncThemAll(function($url, $ex): void {
 			if ($ex instanceof \Exception) {
 				$this->logger->error("Error while syncing $url.", [
 					'exception' => $ex,

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Spacing +6 added lines, -6 removed lines

@@ -86,7 +86,7 @@ 
 	 */
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -105,7 +105,7 @@ 
 		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/');
 
 		try {
 			$result = $this->httpClient->post(
@@ -126,13 +126,13 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.');
+				$this->logger->info($target.' refused to ask for a shared secret.');
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage());
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target);
+			$this->logger->info('Could not connect to '.$target);
 		} catch (\Throwable $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
 			$this->logger->error($e->getMessage(), ['exception' => $e]);
@@ -152,7 +152,7 @@ 
 	 */
 	protected function reAddJob(array $argument): void {
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$token = $argument['token'];
 		$attempt = $this->getAttempt($argument) + 1;
 

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Spacing +6 added lines, -6 removed lines

@@ -73,7 +73,7 @@ 
 
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : $this->time->getTime();
+		$created = isset($argument['created']) ? (int) $argument['created'] : $this->time->getTime();
 		$currentTime = $this->time->getTime();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -92,7 +92,7 @@ 
 		$endPoint = $endPoints['shared-secret'] ?? $this->defaultEndPoint;
 
 		// make sure that we have a well formatted url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/');
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/');
 
 		$result = null;
 		try {
@@ -115,13 +115,13 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.');
+				$this->logger->info($target.' refused to exchange a shared secret with you.');
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage());
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage());
 			}
 		} catch (RequestException $e) {
 			$status = -1; // There is no status code if we could not connect
-			$this->logger->info('Could not connect to ' . $target, [
+			$this->logger->info('Could not connect to '.$target, [
 				'exception' => $e,
 			]);
 		} catch (\Throwable $e) {
@@ -149,7 +149,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-					'remote server "' . $target . '"" does not return a valid shared secret. Received data: ' . $body
+					'remote server "'.$target.'"" does not return a valid shared secret. Received data: '.$body
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
 			}

apps/federation/lib/Controller/OCSAuthAPIController.php

Spacing +4 added lines, -4 removed lines

@@ -98,7 +98,7 @@ 
 	public function requestSharedSecret(string $url, string $token): DataResponse {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret');
+			$this->logger->error('remote server not trusted ('.$url.') while requesting shared secret');
 			throw new OCSForbiddenException();
 		}
 
@@ -107,7 +107,7 @@ 
 		$localToken = $this->dbHandler->getToken($url);
 		if (strcmp($localToken, $token) > 0) {
 			$this->logger->info(
-				'remote server (' . $url . ') presented lower token. We will initiate the exchange of the shared secret.'
+				'remote server ('.$url.') presented lower token. We will initiate the exchange of the shared secret.'
 			);
 			throw new OCSForbiddenException();
 		}
@@ -140,7 +140,7 @@ 
 	public function getSharedSecret(string $url, string $token): DataResponse {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret');
+			$this->logger->error('remote server not trusted ('.$url.') while getting shared secret');
 			throw new OCSForbiddenException();
 		}
 
@@ -148,7 +148,7 @@ 
 			$this->throttler->registerAttempt('federationSharedSecret', $this->request->getRemoteAddress());
 			$expectedToken = $this->dbHandler->getToken($url);
 			$this->logger->error(
-				'remote server (' . $url . ') didn\'t send a valid token (got "' . $token . '" but expected "' . $expectedToken . '") while getting shared secret'
+				'remote server ('.$url.') didn\'t send a valid token (got "'.$token.'" but expected "'.$expectedToken.'") while getting shared secret'
 			);
 			throw new OCSForbiddenException();
 		}