nextcloud / server

apps/federation/lib/Controller/OCSAuthAPIController.php

Spacing +5 added lines, -5 removed lines

@@ -44,7 +44,7 @@ 
  *
  * @package OCA\Federation\Controller
  */
-class OCSAuthAPIController extends OCSController{
+class OCSAuthAPIController extends OCSController {
 
 	/** @var ISecureRandom  */
 	private $secureRandom;
@@ -103,7 +103,7 @@ 
 	 */
 	public function requestSharedSecret($url, $token) {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while requesting shared secret', ['app' => 'federation']);
+			$this->logger->error('remote server not trusted ('.$url.') while requesting shared secret', ['app' => 'federation']);
 			throw new OCSForbiddenException();
 		}
 
@@ -112,7 +112,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.',
 				['app' => 'federation']
 			);
 			throw new OCSForbiddenException();
@@ -151,14 +151,14 @@ 
 	 */
 	public function getSharedSecret($url, $token) {
 		if ($this->trustedServers->isTrustedServer($url) === false) {
-			$this->logger->error('remote server not trusted (' . $url . ') while getting shared secret', ['app' => 'federation']);
+			$this->logger->error('remote server not trusted ('.$url.') while getting shared secret', ['app' => 'federation']);
 			throw new OCSForbiddenException();
 		}
 
 		if ($this->isValidToken($url, $token) === false) {
 			$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',
 				['app' => 'federation']
 			);
 			throw new OCSForbiddenException();

apps/federation/lib/AppInfo/Application.php

Spacing +1 added lines, -1 removed lines

@@ -82,7 +82,7 @@
 			);
 		});
 
-		$container->registerService('SettingsController', function (IAppContainer $c) {
+		$container->registerService('SettingsController', function(IAppContainer $c) {
 			$server = $c->getServer();
 			return new SettingsController(
 				$c->getAppName(),

apps/federation/lib/Command/SyncFederationAddressBooks.php

Spacing +1 added lines, -1 removed lines

@@ -60,7 +60,7 @@
 		$progress->start();
 		$this->syncService->syncThemAll(function($url, $ex) use ($progress, $output) {
 			if ($ex instanceof \Exception) {
-				$output->writeln("Error while syncing $url : " . $ex->getMessage());
+				$output->writeln("Error while syncing $url : ".$ex->getMessage());
 
 			} else {
 				$progress->advance();

apps/federation/lib/TrustedServers.php

Spacing +3 added lines, -3 removed lines

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

apps/federation/lib/BackgroundJob/GetSharedSecret.php

Spacing +5 added lines, -5 removed lines

@@ -45,7 +45,7 @@ 
  *
  * @package OCA\Federation\Backgroundjob
  */
-class GetSharedSecret extends Job{
+class GetSharedSecret extends Job {
 
 	/** @var IClient */
 	private $httpClient;
@@ -145,7 +145,7 @@ 
 		$result = null;
 		try {
 			$result = $this->httpClient->get(
-				$target . $this->endPoint,
+				$target.$this->endPoint,
 				[
 					'query' =>
 						[
@@ -162,7 +162,7 @@ 
 		} 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->logException($e, ['app' => 'federation']);
 			}
@@ -177,7 +177,7 @@ 
 			&& $status !== Http::STATUS_FORBIDDEN
 		) {
 			$this->retainJob = true;
-		}  else {
+		} else {
 			// reset token if we received a valid response
 			$this->dbHandler->addToken($target, '');
 		}
@@ -192,7 +192,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);

apps/federation/lib/BackgroundJob/RequestSharedSecret.php

Spacing +2 added lines, -2 removed lines

@@ -144,7 +144,7 @@ 
 
 		try {
 			$result = $this->httpClient->post(
-				$target . $this->endPoint,
+				$target.$this->endPoint,
 				[
 					'body' => [
 						'url' => $source,
@@ -160,7 +160,7 @@ 
 		} 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->logException($e, ['app' => 'federation']);
 			}

apps/federation/lib/DbHandler.php

Spacing +5 added lines, -5 removed lines

@@ -87,9 +87,9 @@ 
 		$result = $query->execute();
 
 		if ($result) {
-			return (int)$this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
+			return (int) $this->connection->lastInsertId('*PREFIX*'.$this->dbTable);
 		} else {
-			$message = 'Internal failure, Could not add trusted server: ' . $url;
+			$message = 'Internal failure, Could not add trusted server: '.$url;
 			$message_t = $this->IL10N->t('Could not add server');
 			throw new HintException($message, $message_t);
 		}
@@ -124,7 +124,7 @@ 
 		$result = $query->execute()->fetchAll();
 
 		if (empty($result)) {
-			throw new \Exception('No Server found with ID: ' . $id);
+			throw new \Exception('No Server found with ID: '.$id);
 		}
 
 		return $result[0];
@@ -193,7 +193,7 @@ 
 		$result = $query->execute()->fetch();
 
 		if (!isset($result['token'])) {
-			throw new \Exception('No token found for: ' . $url);
+			throw new \Exception('No token found for: '.$url);
 		}
 
 		return $result['token'];
@@ -266,7 +266,7 @@ 
 				->setParameter('url_hash', $hash);
 
 		$result = $query->execute()->fetch();
-		return (int)$result['status'];
+		return (int) $result['status'];
 	}
 
 	/**

apps/federation/lib/SyncJob.php

Spacing +1 added lines, -1 removed lines

@@ -37,7 +37,7 @@
 		$ss = $app->getSyncService();
 		$ss->syncThemAll(function($url, $ex) {
 			if ($ex instanceof \Exception) {
-				\OC::$server->getLogger()->error("Error while syncing $url : " . $ex->getMessage(), ['app' => 'fed-sync']);
+				\OC::$server->getLogger()->error("Error while syncing $url : ".$ex->getMessage(), ['app' => 'fed-sync']);
 			}
 		});
 	}

apps/dav/lib/DAV/PublicAuth.php

Spacing +1 added lines, -1 removed lines

@@ -84,7 +84,7 @@
 	 */
 	private function isRequestPublic(RequestInterface $request) {
 		$url = $request->getPath();
-		$matchingUrls = array_filter($this->publicURLs, function ($publicUrl) use ($url) {
+		$matchingUrls = array_filter($this->publicURLs, function($publicUrl) use ($url) {
 			return strpos($url, $publicUrl, 0) === 0;
 		});
 		return !empty($matchingUrls);