nextcloud / server

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Spacing +9 added lines, -9 removed lines

@@ -47,7 +47,7 @@ 
  *
  * @package OCA\Federation\Backgroundjob
  */
-class GetSharedSecret extends Job{
+class GetSharedSecret extends Job {
 
 	/** @var IClient */
 	private $httpClient;
@@ -141,7 +141,7 @@ 
 
 	protected function run($argument) {
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : time();
+		$created = isset($argument['created']) ? (int) $argument['created'] : time();
 		$currentTime = time();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -151,7 +151,7 @@ 
 		$deadline = $currentTime - $this->maxLifespan;
 		if ($created < $deadline) {
 			$this->retainJob = false;
-			$this->trustedServers->setServerStatus($target,TrustedServers::STATUS_FAILURE);
+			$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
 			return;
 		}
 
@@ -159,7 +159,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		$result = null;
 		try {
@@ -181,9 +181,9 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to exchange a shared secret with you.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to exchange a shared secret with you.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
@@ -196,7 +196,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -211,7 +211,7 @@ 
 				);
 			} else {
 				$this->logger->error(
-						'remote server "' . $target . '"" does not return a valid shared secret',
+						'remote server "'.$target.'"" does not return a valid shared secret',
 						['app' => 'federation']
 				);
 				$this->trustedServers->setServerStatus($target, TrustedServers::STATUS_FAILURE);
@@ -228,7 +228,7 @@ 
 	 */
 	protected function reAddJob(IJobList $jobList, array $argument) {
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : time();
+		$created = isset($argument['created']) ? (int) $argument['created'] : time();
 		$token = $argument['token'];
 		$this->jobList->add(
 			GetSharedSecret::class,

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Spacing +5 added lines, -5 removed lines

@@ -143,7 +143,7 @@ 
 	protected function run($argument) {
 
 		$target = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : time();
+		$created = isset($argument['created']) ? (int) $argument['created'] : time();
 		$currentTime = time();
 		$source = $this->urlGenerator->getAbsoluteURL('/');
 		$source = rtrim($source, '/');
@@ -161,7 +161,7 @@ 
 		$endPoint = isset($endPoints['shared-secret']) ? $endPoints['shared-secret'] : $this->defaultEndPoint;
 
 		// make sure that we have a well formated url
-		$url = rtrim($target, '/') . '/' . trim($endPoint, '/') . $this->format;
+		$url = rtrim($target, '/').'/'.trim($endPoint, '/').$this->format;
 
 		try {
 			$result = $this->httpClient->post(
@@ -181,9 +181,9 @@ 
 		} catch (ClientException $e) {
 			$status = $e->getCode();
 			if ($status === Http::STATUS_FORBIDDEN) {
-				$this->logger->info($target . ' refused to ask for a shared secret.', ['app' => 'federation']);
+				$this->logger->info($target.' refused to ask for a shared secret.', ['app' => 'federation']);
 			} else {
-				$this->logger->info($target . ' responded with a ' . $status . ' containing: ' . $e->getMessage(), ['app' => 'federation']);
+				$this->logger->info($target.' responded with a '.$status.' containing: '.$e->getMessage(), ['app' => 'federation']);
 			}
 		} catch (\Exception $e) {
 			$status = Http::STATUS_INTERNAL_SERVER_ERROR;
@@ -214,7 +214,7 @@ 
 	protected function reAddJob(IJobList $jobList, array $argument) {
 
 		$url = $argument['url'];
-		$created = isset($argument['created']) ? (int)$argument['created'] : time();
+		$created = isset($argument['created']) ? (int) $argument['created'] : time();
 		$token = $argument['token'];
 
 		$jobList->add(

apps/federation/lib/TrustedServers.php

Spacing +3 added lines, -3 removed lines

@@ -222,7 +222,7 @@ 
 		$client = $this->httpClientService->newClient();
 		try {
 			$result = $client->get(
-				$url . '/status.php',
+				$url.'/status.php',
 				[
 					'timeout' => 3,
 					'connect_timeout' => 3,
@@ -233,7 +233,7 @@ 
 
 			}
 		} catch (\Exception $e) {
-			$this->logger->debug('No Nextcloud server: ' . $e->getMessage());
+			$this->logger->debug('No Nextcloud server: '.$e->getMessage());
 			return false;
 		}
 
@@ -274,7 +274,7 @@ 
 
 		}
 
-		return 'https://' . $url;
+		return 'https://'.$url;
 	}
 
 	protected function getTimestamp() {