nextcloud / server

apps/federatedfilesharing/lib/DiscoveryManager.php

Spacing +9 added lines, -9 removed lines

@@ -62,7 +62,7 @@ 
 	 * @return bool
 	 */
 	private function isSafeUrl($url) {
-		return (bool)preg_match('/^[\/\.A-Za-z0-9]+$/', $url);
+		return (bool) preg_match('/^[\/\.A-Za-z0-9]+$/', $url);
 	}
 
 	/**
@@ -76,7 +76,7 @@ 
 	 */
 	private function discover($remote) {
 		// Check if something is in the cache
-		if($cacheData = $this->cache->get($remote)) {
+		if ($cacheData = $this->cache->get($remote)) {
 			return json_decode($cacheData, true);
 		}
 
@@ -88,22 +88,22 @@ 
 
 		// Read the data from the response body
 		try {
-			$response = $this->client->get($remote . '/ocs-provider/', [
+			$response = $this->client->get($remote.'/ocs-provider/', [
 				'timeout' => 10,
 				'connect_timeout' => 10,
 			]);
-			if($response->getStatusCode() === 200) {
+			if ($response->getStatusCode() === 200) {
 				$decodedService = json_decode($response->getBody(), true);
-				if(is_array($decodedService)) {
+				if (is_array($decodedService)) {
 					$endpoints = [
 						'webdav',
 						'share',
 					];
 
-					foreach($endpoints as $endpoint) {
-						if(isset($decodedService['services']['FEDERATED_SHARING']['endpoints'][$endpoint])) {
-							$endpointUrl = (string)$decodedService['services']['FEDERATED_SHARING']['endpoints'][$endpoint];
-							if($this->isSafeUrl($endpointUrl)) {
+					foreach ($endpoints as $endpoint) {
+						if (isset($decodedService['services']['FEDERATED_SHARING']['endpoints'][$endpoint])) {
+							$endpointUrl = (string) $decodedService['services']['FEDERATED_SHARING']['endpoints'][$endpoint];
+							if ($this->isSafeUrl($endpointUrl)) {
 								$discoveredServices[$endpoint] = $endpointUrl;
 							}
 						}

apps/federatedfilesharing/lib/Controller/MountPublicLinkController.php

Spacing +6 added lines, -6 removed lines

@@ -147,7 +147,7 @@ 
 		$storedPassword = $share->getPassword();
 		$authenticated = $this->session->get('public_link_authenticated') === $share->getId() ||
 			$this->shareManager->checkPassword($share, $password);
-		if (!empty($storedPassword) && !$authenticated ) {
+		if (!empty($storedPassword) && !$authenticated) {
 			return new JSONResponse(
 				['message' => 'No permission to access the share'],
 				Http::STATUS_BAD_REQUEST
@@ -189,7 +189,7 @@ 
 		$httpClient = $this->clientService->newClient();
 
 		try {
-			$response = $httpClient->post($remote . '/index.php/apps/federatedfilesharing/createFederatedShare',
+			$response = $httpClient->post($remote.'/index.php/apps/federatedfilesharing/createFederatedShare',
 				[
 					'body' =>
 						[
@@ -287,14 +287,14 @@ 
 			// note: checkStorageAvailability will already remove the invalid share
 			Util::writeLog(
 				'federatedfilesharing',
-				'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+				'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
 				Util::DEBUG
 			);
 			return new JSONResponse(['message' => $this->l->t('Could not authenticate to remote share, password might be wrong')], Http::STATUS_BAD_REQUEST);
 		} catch (\Exception $e) {
 			Util::writeLog(
 				'federatedfilesharing',
-				'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+				'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
 				Util::DEBUG
 			);
 			$externalManager->removeShare($mount->getMountPoint());
@@ -313,14 +313,14 @@ 
 			} catch (StorageInvalidException $e) {
 				Util::writeLog(
 					'federatedfilesharing',
-					'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+					'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
 					Util::DEBUG
 				);
 				return new JSONResponse(['message' => $this->l->t('Storage not valid')], Http::STATUS_BAD_REQUEST);
 			} catch (\Exception $e) {
 				Util::writeLog(
 					'federatedfilesharing',
-					'Invalid remote storage: ' . get_class($e) . ': ' . $e->getMessage(),
+					'Invalid remote storage: '.get_class($e).': '.$e->getMessage(),
 					Util::DEBUG
 				);
 				return new JSONResponse(['message' => $this->l->t('Couldn\'t add remote share')], Http::STATUS_BAD_REQUEST);

apps/federatedfilesharing/lib/Controller/RequestHandlerController.php

Spacing +15 added lines, -15 removed lines

@@ -127,24 +127,24 @@ 
 		$owner = isset($_POST['owner']) ? $_POST['owner'] : null;
 		$sharedBy = isset($_POST['sharedBy']) ? $_POST['sharedBy'] : null;
 		$shareWith = isset($_POST['shareWith']) ? $_POST['shareWith'] : null;
-		$remoteId = isset($_POST['remoteId']) ? (int)$_POST['remoteId'] : null;
+		$remoteId = isset($_POST['remoteId']) ? (int) $_POST['remoteId'] : null;
 		$sharedByFederatedId = isset($_POST['sharedByFederatedId']) ? $_POST['sharedByFederatedId'] : null;
 		$ownerFederatedId = isset($_POST['ownerFederatedId']) ? $_POST['ownerFederatedId'] : null;
 
 		if ($remote && $token && $name && $owner && $remoteId && $shareWith) {
 
-			if(!\OCP\Util::isValidFileName($name)) {
+			if (!\OCP\Util::isValidFileName($name)) {
 				throw new OCSException('The mountpoint name contains invalid characters.', 400);
 			}
 
 			// FIXME this should be a method in the user management instead
-			\OCP\Util::writeLog('files_sharing', 'shareWith before, ' . $shareWith, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('files_sharing', 'shareWith before, '.$shareWith, \OCP\Util::DEBUG);
 			\OCP\Util::emitHook(
 				'\OCA\Files_Sharing\API\Server2Server',
 				'preLoginNameUsedAsUserName',
 				array('uid' => &$shareWith)
 			);
-			\OCP\Util::writeLog('files_sharing', 'shareWith after, ' . $shareWith, \OCP\Util::DEBUG);
+			\OCP\Util::writeLog('files_sharing', 'shareWith after, '.$shareWith, \OCP\Util::DEBUG);
 
 			if (!\OCP\User::userExists($shareWith)) {
 				throw new OCSException('User does not exists', 400);
@@ -199,20 +199,20 @@ 
 
 				$declineAction = $notification->createAction();
 				$declineAction->setLabel('decline')
-					->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
+					->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'DELETE');
 				$notification->addAction($declineAction);
 
 				$acceptAction = $notification->createAction();
 				$acceptAction->setLabel('accept')
-					->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
+					->setLink($urlGenerator->getAbsoluteURL($urlGenerator->linkTo('', 'ocs/v1.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'POST');
 				$notification->addAction($acceptAction);
 
 				$notificationManager->notify($notification);
 
 				return new Http\DataResponse();
 			} catch (\Exception $e) {
-				\OCP\Util::writeLog('files_sharing', 'server can not add remote share, ' . $e->getMessage(), \OCP\Util::ERROR);
-				throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
+				\OCP\Util::writeLog('files_sharing', 'server can not add remote share, '.$e->getMessage(), \OCP\Util::ERROR);
+				throw new OCSException('internal server error, was not able to add share from '.$remote, 500);
 			}
 		}
 
@@ -235,8 +235,8 @@ 
 
 		$token = $this->request->getParam('token', null);
 		$shareWith = $this->request->getParam('shareWith', null);
-		$permission = (int)$this->request->getParam('permission', null);
-		$remoteId = (int)$this->request->getParam('remoteId', null);
+		$permission = (int) $this->request->getParam('permission', null);
+		$remoteId = (int) $this->request->getParam('remoteId', null);
 
 		if ($id === null ||
 			$token === null ||
@@ -257,7 +257,7 @@ 
 		list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
 		$owner = $share->getShareOwner();
 		$currentServer = $this->addressHandler->generateRemoteURL();
-		if ($this->addressHandler->compareAddresses($user, $remote,$owner , $currentServer)) {
+		if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
 			throw new OCSForbiddenException();
 		}
 
@@ -271,7 +271,7 @@ 
 				$share->setSharedWith($shareWith);
 				try {
 					$result = $this->federatedShareProvider->create($share);
-					$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $remoteId);
+					$this->federatedShareProvider->storeRemoteId((int) $result->getId(), $remoteId);
 					return new Http\DataResponse([
 						'token' => $result->getToken(),
 						'remoteId' => $result->getId()
@@ -359,7 +359,7 @@ 
 			return new Http\DataResponse();
 		}
 
-		if($this->verifyShare($share, $token)) {
+		if ($this->verifyShare($share, $token)) {
 			if ($share->getShareOwner() !== $share->getSharedBy()) {
 				list(, $remote) = $this->addressHandler->splitUserRemote($share->getSharedBy());
 				$remoteId = $this->federatedShareProvider->getRemoteId($share);
@@ -398,7 +398,7 @@ 
 	 * @return string
 	 */
 	protected function getCorrectUid(Share\IShare $share) {
-		if($this->userManager->userExists($share->getShareOwner())) {
+		if ($this->userManager->userExists($share->getShareOwner())) {
 			return $share->getShareOwner();
 		}
 
@@ -598,7 +598,7 @@ 
 		$validPermission = ctype_digit($permissions);
 		$validToken = $this->verifyShare($share, $token);
 		if ($validPermission && $validToken) {
-			$this->updatePermissionsInDatabase($share, (int)$permissions);
+			$this->updatePermissionsInDatabase($share, (int) $permissions);
 		} else {
 			throw new OCSBadRequestException();
 		}

apps/federatedfilesharing/lib/BackgroundJob/RetryJob.php

Spacing +3 added lines, -3 removed lines

@@ -105,7 +105,7 @@ 
 		$token = $argument['token'];
 		$action = $argument['action'];
 		$data = json_decode($argument['data'], true);
-		$try = (int)$argument['try'] + 1;
+		$try = (int) $argument['try'] + 1;
 
 		$result = $this->notifications->sendUpdateToRemote($remote, $remoteId, $token, $action, $data, $try);
 		
@@ -128,7 +128,7 @@ 
 				'token' => $argument['token'],
 				'data' => $argument['data'],
 				'action' => $argument['action'],
-				'try' => (int)$argument['try'] + 1,
+				'try' => (int) $argument['try'] + 1,
 				'lastRun' => time()
 			]
 		);
@@ -141,7 +141,7 @@ 
 	 * @return bool
 	 */
 	protected function shouldRun(array $argument) {
-		$lastRun = (int)$argument['lastRun'];
+		$lastRun = (int) $argument['lastRun'];
 		return ((time() - $lastRun) > $this->interval);
 	}
 

apps/federatedfilesharing/lib/TokenHandler.php

Spacing +1 added lines, -1 removed lines

@@ -55,7 +55,7 @@
 	public function generateToken() {
 		$token = $this->secureRandom->generate(
 			self::TOKEN_LENGTH,
-			ISecureRandom::CHAR_LOWER . ISecureRandom::CHAR_UPPER . ISecureRandom::CHAR_DIGITS);
+			ISecureRandom::CHAR_LOWER.ISecureRandom::CHAR_UPPER.ISecureRandom::CHAR_DIGITS);
 		return $token;
 	}
 

apps/federation/templates/settings-admin.php

Spacing +6 added lines, -6 removed lines

@@ -11,7 +11,7 @@ 
 	<em><?php p($l->t('Federation allows you to connect with other trusted servers to exchange the user directory. For example this will be used to auto-complete external users for federated sharing.')); ?></em>
 
 	<p>
-		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if($_['autoAddServers']) p('checked'); ?> />
+		<input id="autoAddServers" type="checkbox" class="checkbox" <?php if ($_['autoAddServers']) p('checked'); ?> />
 		<label for="autoAddServers"><?php p($l->t('Add server automatically once a federated share was created successfully')); ?></label>
 	</p>
 
@@ -23,14 +23,14 @@ 
 		<span class="msg"></span>
 	</p>
 	<ul id="listOfTrustedServers">
-		<?php foreach($_['trustedServers'] as $trustedServer) { ?>
+		<?php foreach ($_['trustedServers'] as $trustedServer) { ?>
 			<li id="<?php p($trustedServer['id']); ?>">
-				<?php if((int)$trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
+				<?php if ((int) $trustedServer['status'] === TrustedServers::STATUS_OK) { ?>
 					<span class="status success"></span>
 				<?php
-				} elseif(
-					(int)$trustedServer['status'] === TrustedServers::STATUS_PENDING ||
-					(int)$trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
+				} elseif (
+					(int) $trustedServer['status'] === TrustedServers::STATUS_PENDING ||
+					(int) $trustedServer['status'] === TrustedServers::STATUS_ACCESS_REVOKED
 				) { ?>
 					<span class="status indeterminate"></span>
 				<?php } else {?>

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();