nextcloud / server

apps/cloud_federation_api/lib/Controller/RequestHandlerController.php

Spacing +6 added lines, -6 removed lines

@@ -150,7 +150,7 @@ 
 
 		if (!$this->userManager->userExists($shareWith)) {
 			return new JSONResponse(
-				['message' => 'User "' . $shareWith . '" does not exists at ' . $this->urlGenerator->getBaseUrl()],
+				['message' => 'User "'.$shareWith.'" does not exists at '.$this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST
 			);
 		}
@@ -182,7 +182,7 @@ 
 			);
 		} catch (\Exception $e) {
 			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST
 			);
 		}
@@ -251,12 +251,12 @@ 
 		}
 		catch (\Exception $e) {
 			return new JSONResponse(
-				['message' => 'Internal error at ' . $this->urlGenerator->getBaseUrl()],
+				['message' => 'Internal error at '.$this->urlGenerator->getBaseUrl()],
 				Http::STATUS_BAD_REQUEST
 			);
 		}
 
-		return new JSONResponse($result,Http::STATUS_CREATED);
+		return new JSONResponse($result, Http::STATUS_CREATED);
 
 	}
 
@@ -269,13 +269,13 @@ 
 	private function mapUid($uid) {
 		\OC::$server->getURLGenerator()->linkToDocs('key');
 		// FIXME this should be a method in the user management instead
-		$this->logger->debug('shareWith before, ' . $uid, ['app' => $this->appName]);
+		$this->logger->debug('shareWith before, '.$uid, ['app' => $this->appName]);
 		\OCP\Util::emitHook(
 			'\OCA\Files_Sharing\API\Server2Server',
 			'preLoginNameUsedAsUserName',
 			array('uid' => &$uid)
 		);
-		$this->logger->debug('shareWith after, ' . $uid, ['app' => $this->appName]);
+		$this->logger->debug('shareWith after, '.$uid, ['app' => $this->appName]);
 
 		return $uid;
 	}

apps/federatedfilesharing/lib/Notifications.php

Spacing +8 added lines, -8 removed lines

@@ -117,7 +117,7 @@ 
 			$ocsStatus = isset($status['ocs']);
 			$ocsSuccess = $ocsStatus && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200);
 
-			if ($result['success'] && (!$ocsStatus ||$ocsSuccess)) {
+			if ($result['success'] && (!$ocsStatus || $ocsSuccess)) {
 				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
 				return true;
 			}
@@ -160,7 +160,7 @@ 
 			return [$ocmResult['token'], $ocmResult['providerId']];
 		}
 
-		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+		$result = $this->tryLegacyEndPoint(rtrim($remote, '/'), '/'.$id.'/reshare', $fields);
 		$status = json_decode($result['result'], true);
 
 		$httpRequestSuccessful = $result['success'];
@@ -171,7 +171,7 @@ 
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
 			return [
 				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
+				(int) $status['ocs']['data']['remoteId']
 			];
 		}
 
@@ -258,7 +258,7 @@ 
 			$fields[$key] = $value;
 		}
 
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields, $action);
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$remoteId.'/'.$action, $fields, $action);
 		$status = json_decode($result['result'], true);
 
 		if ($result['success'] &&
@@ -306,10 +306,10 @@ 
 	 * @return array
 	 * @throws \Exception
 	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action="share") {
+	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields, $action = "share") {
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
+			$remoteDomain = 'https://'.$remoteDomain;
 		}
 
 		$result = [
@@ -348,7 +348,7 @@ 
 		$federationEndpoints = $this->discoveryService->discover($remoteDomain, 'FEDERATED_SHARING');
 		$endpoint = isset($federationEndpoints['share']) ? $federationEndpoints['share'] : '/ocs/v2.php/cloud/shares';
 		try {
-			$response = $client->post($remoteDomain . $endpoint . $urlSuffix . '?format=' . self::RESPONSE_FORMAT, [
+			$response = $client->post($remoteDomain.$endpoint.$urlSuffix.'?format='.self::RESPONSE_FORMAT, [
 				'body' => $fields,
 				'timeout' => 10,
 				'connect_timeout' => 10,
@@ -405,7 +405,7 @@ 
 		switch ($action) {
 			case 'share':
 				$share = $this->cloudFederationFactory->getCloudFederationShare(
-					$fields['shareWith'] . '@' . $remoteDomain,
+					$fields['shareWith'].'@'.$remoteDomain,
 					$fields['name'],
 					'',
 					$fields['remoteId'],

apps/federatedfilesharing/lib/FederatedShareProvider.php

Spacing +19 added lines, -19 removed lines

@@ -192,7 +192,7 @@ 
 		if ($remoteShare) {
 			try {
 				$ownerCloudId = $this->cloudIdManager->getCloudId($remoteShare['owner'], $remoteShare['remote']);
-				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_' . time());
+				$shareId = $this->addShareToDB($itemSource, $itemType, $shareWith, $sharedBy, $ownerCloudId->getId(), $permissions, 'tmp_token_'.time());
 				$share->setId($shareId);
 				list($token, $remoteId) = $this->askOwnerToReShare($shareWith, $share, $shareId);
 				// remote share was create successfully if we get a valid token as return
@@ -272,7 +272,7 @@ 
 			$failure = true;
 		}
 
-		if($failure) {
+		if ($failure) {
 			$this->removeShareFromTableById($shareId);
 			$message_t = $this->l->t('Sharing %s failed, could not find %s, maybe the server is currently unreachable or uses a self-signed certificate.',
 				[$share->getNode()->getName(), $share->getSharedWith()]);
@@ -324,7 +324,7 @@ 
 			->andWhere($query->expr()->eq('mountpoint', $query->createNamedParameter($share->getTarget())));
 		$result = $query->execute()->fetchAll();
 
-		if (isset($result[0]) && (int)$result[0]['remote_id'] > 0) {
+		if (isset($result[0]) && (int) $result[0]['remote_id'] > 0) {
 			return $result[0];
 		}
 
@@ -366,7 +366,7 @@ 
 		$qb->execute();
 		$id = $qb->getLastInsertId();
 
-		return (int)$id;
+		return (int) $id;
 	}
 
 	/**
@@ -456,14 +456,14 @@ 
 	public function getRemoteId(IShare $share) {
 		$query = $this->dbConnection->getQueryBuilder();
 		$query->select('remote_id')->from('federated_reshares')
-			->where($query->expr()->eq('share_id', $query->createNamedParameter((int)$share->getId())));
+			->where($query->expr()->eq('share_id', $query->createNamedParameter((int) $share->getId())));
 		$data = $query->execute()->fetch();
 
 		if (!is_array($data) || !isset($data['remote_id'])) {
 			throw new ShareNotFound();
 		}
 
-		return (int)$data['remote_id'];
+		return (int) $data['remote_id'];
 	}
 
 	/**
@@ -494,7 +494,7 @@ 
 			->orderBy('id');
 
 		$cursor = $qb->execute();
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$children[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -612,7 +612,7 @@ 
 			);
 		}
 
-		$qb->innerJoin('s', 'filecache' ,'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
+		$qb->innerJoin('s', 'filecache', 'f', $qb->expr()->eq('s.file_source', 'f.fileid'));
 		$qb->andWhere($qb->expr()->eq('f.parent', $qb->createNamedParameter($node->getId())));
 
 		$qb->orderBy('id');
@@ -675,7 +675,7 @@ 
 
 		$cursor = $qb->execute();
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -699,7 +699,7 @@ 
 		$cursor->closeCursor();
 
 		if ($data === false) {
-			throw new ShareNotFound('Can not find share with ID: ' . $id);
+			throw new ShareNotFound('Can not find share with ID: '.$id);
 		}
 
 		try {
@@ -727,7 +727,7 @@ 
 			->execute();
 
 		$shares = [];
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -766,7 +766,7 @@ 
 
 		$cursor = $qb->execute();
 
-		while($data = $cursor->fetch()) {
+		while ($data = $cursor->fetch()) {
 			$shares[] = $this->createShareObject($data);
 		}
 		$cursor->closeCursor();
@@ -843,15 +843,15 @@ 
 	private function createShareObject($data) {
 
 		$share = new Share($this->rootFolder, $this->userManager);
-		$share->setId((int)$data['id'])
-			->setShareType((int)$data['share_type'])
-			->setPermissions((int)$data['permissions'])
+		$share->setId((int) $data['id'])
+			->setShareType((int) $data['share_type'])
+			->setPermissions((int) $data['permissions'])
 			->setTarget($data['file_target'])
-			->setMailSend((bool)$data['mail_send'])
+			->setMailSend((bool) $data['mail_send'])
 			->setToken($data['token']);
 
 		$shareTime = new \DateTime();
-		$shareTime->setTimestamp((int)$data['stime']);
+		$shareTime->setTimestamp((int) $data['stime']);
 		$share->setShareTime($shareTime);
 		$share->setSharedWith($data['share_with']);
 
@@ -861,13 +861,13 @@ 
 		} else {
 			//OLD SHARE
 			$share->setSharedBy($data['uid_owner']);
-			$path = $this->getNode($share->getSharedBy(), (int)$data['file_source']);
+			$path = $this->getNode($share->getSharedBy(), (int) $data['file_source']);
 
 			$owner = $path->getOwner();
 			$share->setShareOwner($owner->getUID());
 		}
 
-		$share->setNodeId((int)$data['file_source']);
+		$share->setNodeId((int) $data['file_source']);
 		$share->setNodeType($data['item_type']);
 
 		$share->setProviderId($this->identifier());

apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php

Spacing +16 added lines, -16 removed lines

@@ -185,16 +185,16 @@ 
 			}
 
 			// FIXME this should be a method in the user management instead
-			$this->logger->debug('shareWith before, ' . $shareWith, ['app' => 'files_sharing']);
+			$this->logger->debug('shareWith before, '.$shareWith, ['app' => 'files_sharing']);
 			Util::emitHook(
 				'\OCA\Files_Sharing\API\Server2Server',
 				'preLoginNameUsedAsUserName',
 				array('uid' => &$shareWith)
 			);
-			$this->logger->debug('shareWith after, ' . $shareWith, ['app' => 'files_sharing']);
+			$this->logger->debug('shareWith after, '.$shareWith, ['app' => 'files_sharing']);
 
 			if (!$this->userManager->userExists($shareWith)) {
-				throw new ProviderCouldNotAddShareException('User does not exists', '',Http::STATUS_BAD_REQUEST);
+				throw new ProviderCouldNotAddShareException('User does not exists', '', Http::STATUS_BAD_REQUEST);
 			}
 
 			\OC_Util::setupFS($shareWith);
@@ -220,7 +220,7 @@ 
 					->setType('remote_share')
 					->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_RECEIVED, [$ownerFederatedId, trim($name, '/')])
 					->setAffectedUser($shareWith)
-					->setObject('remote_share', (int)$shareId, $name);
+					->setObject('remote_share', (int) $shareId, $name);
 				\OC::$server->getActivityManager()->publish($event);
 
 				$notification = $this->notificationManager->createNotification();
@@ -232,12 +232,12 @@ 
 
 				$declineAction = $notification->createAction();
 				$declineAction->setLabel('decline')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'DELETE');
+					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'DELETE');
 				$notification->addAction($declineAction);
 
 				$acceptAction = $notification->createAction();
 				$acceptAction->setLabel('accept')
-					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/' . $shareId)), 'POST');
+					->setLink($this->urlGenerator->getAbsoluteURL($this->urlGenerator->linkTo('', 'ocs/v2.php/apps/files_sharing/api/v1/remote_shares/pending/'.$shareId)), 'POST');
 				$notification->addAction($acceptAction);
 
 				$this->notificationManager->notify($notification);
@@ -249,7 +249,7 @@ 
 					'level' => ILogger::ERROR,
 					'app' => 'files_sharing'
 				]);
-				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from ' . $remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
+				throw new ProviderCouldNotAddShareException('internal server error, was not able to add share from '.$remote, '', HTTP::STATUS_INTERNAL_SERVER_ERROR);
 			}
 		}
 
@@ -346,7 +346,7 @@ 
 	 */
 	protected function executeAcceptShare(IShare $share) {
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFound();
@@ -424,7 +424,7 @@ 
 		$this->federatedShareProvider->removeShareFromTable($share);
 
 		try {
-			$fileId = (int)$share->getNode()->getId();
+			$fileId = (int) $share->getNode()->getId();
 			list($file, $link) = $this->getFile($this->getCorrectUid($share), $fileId);
 		} catch (\Exception $e) {
 			throw new ShareNotFound();
@@ -525,7 +525,7 @@ 
 			$notification = $this->notificationManager->createNotification();
 			$notification->setApp('files_sharing')
 				->setUser($share['user'])
-				->setObject('remote_share', (int)$share['id']);
+				->setObject('remote_share', (int) $share['id']);
 			$this->notificationManager->markProcessed($notification);
 
 			$event = $this->activityManager->generateEvent();
@@ -533,7 +533,7 @@ 
 				->setType('remote_share')
 				->setSubject(RemoteShares::SUBJECT_REMOTE_SHARE_UNSHARED, [$owner->getId(), $path])
 				->setAffectedUser($user)
-				->setObject('remote_share', (int)$share['id'], $path);
+				->setObject('remote_share', (int) $share['id'], $path);
 			\OC::$server->getActivityManager()->publish($event);
 		}
 
@@ -581,7 +581,7 @@ 
 			$owner = $share->getShareOwner();
 			$currentServer = $this->addressHandler->generateRemoteURL();
 			if ($this->addressHandler->compareAddresses($user, $remote, $owner, $currentServer)) {
-				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: ' . $id);
+				throw new ProviderCouldNotAddShareException('Resharing back to the owner is not allowed: '.$id);
 			}
 		} catch (\Exception $e) {
 			throw new ProviderCouldNotAddShareException($e->getMessage());
@@ -595,10 +595,10 @@ 
 			$share->setSharedBy($share->getSharedWith());
 			$share->setSharedWith($shareWith);
 			$result = $this->federatedShareProvider->create($share);
-			$this->federatedShareProvider->storeRemoteId((int)$result->getId(), $senderId);
+			$this->federatedShareProvider->storeRemoteId((int) $result->getId(), $senderId);
 			return ['token' => $result->getToken(), 'providerId' => $result->getId()];
 		} else {
-			throw new ProviderCouldNotAddShareException('resharing not allowed for share: ' . $id);
+			throw new ProviderCouldNotAddShareException('resharing not allowed for share: '.$id);
 		}
 
 	}
@@ -644,7 +644,7 @@ 
 	 */
 	protected function ocmPermissions2ncPermissions(array $ocmPermissions) {
 		$ncPermissions = 0;
-		foreach($ocmPermissions as $permission) {
+		foreach ($ocmPermissions as $permission) {
 			switch (strtolower($permission)) {
 				case 'read':
 					$ncPermissions += Constants::PERMISSION_READ;
@@ -659,7 +659,7 @@ 
 					throw new BadRequestException(['permission']);
 			}
 
-			error_log("new permissions: " . $ncPermissions);
+			error_log("new permissions: ".$ncPermissions);
 		}
 
 		return $ncPermissions;

apps/federatedfilesharing/lib/Controller/RequestHandlerController.php

Spacing +12 added lines, -12 removed lines

@@ -145,7 +145,7 @@ 
 		$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;
 
@@ -180,7 +180,7 @@ 
 		} catch (ProviderCouldNotAddShareException $e) {
 			throw new OCSException($e->getMessage(), 400);
 		} catch (\Exception $e) {
-			throw new OCSException('internal server error, was not able to add share from ' . $remote, 500);
+			throw new OCSException('internal server error, was not able to add share from '.$remote, 500);
 		}
 
 		return new Http\DataResponse();
@@ -202,8 +202,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 ||
@@ -231,9 +231,9 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		throw new OCSBadRequestException();
@@ -267,9 +267,9 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -300,9 +300,9 @@ 
 		} catch (ProviderDoesNotExistsException $e) {
 			throw new OCSException('Server does not support federated cloud sharing', 503);
 		} catch (ShareNotFound $e) {
-			$this->logger->debug('Share not found: ' . $e->getMessage());
+			$this->logger->debug('Share not found: '.$e->getMessage());
 		} catch (\Exception $e) {
-			$this->logger->debug('internal server error, can not process notification: ' . $e->getMessage());
+			$this->logger->debug('internal server error, can not process notification: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -331,7 +331,7 @@ 
 			$notification = ['sharedSecret' => $token];
 			$provider->notificationReceived('SHARE_UNSHARED', $id, $notification);
 		} catch (\Exception $e) {
-			$this->logger->debug('processing unshare notification failed: ' . $e->getMessage());
+			$this->logger->debug('processing unshare notification failed: '.$e->getMessage());
 		}
 
 		return new Http\DataResponse();
@@ -404,7 +404,7 @@ 
 
 		try {
 			$provider = $this->cloudFederationProviderManager->getCloudFederationProvider('file');
-			$ocmPermissions = $this->ncPermissions2ocmPermissions((int)$ncPermissions);
+			$ocmPermissions = $this->ncPermissions2ocmPermissions((int) $ncPermissions);
 			$notification = ['sharedSecret' => $token, 'permission' => $ocmPermissions];
 			$provider->notificationReceived('RESHARE_CHANGE_PERMISSION', $id, $notification);
 		} catch (\Exception $e) {