nextcloud / server

apps/federatedfilesharing/lib/ocm/CloudFederationProviderFiles.php

Doc Comments +1 added lines, -1 removed lines

@@ -121,7 +121,7 @@
 	 * share received from another server
 	 *
 	 * @param ICloudFederationShare $share
-	 * @return string provider specific unique ID of the share
+	 * @return integer provider specific unique ID of the share
 	 *
 	 * @throws ProviderCouldNotAddShareException
 	 * @throws \OCP\AppFramework\QueryException

Spacing +7 added lines, -7 removed lines

@@ -165,16 +165,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']);
 			\OCP\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);
@@ -198,7 +198,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();
@@ -210,12 +210,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);
@@ -227,7 +227,7 @@ 
 					'level' => \OCP\Util::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);
 			}
 		}
 

ocm-provider/index.php

Spacing +1 added lines, -1 removed lines

@@ -20,7 +20,7 @@
  */
 
 
-require_once __DIR__ . '/../lib/base.php';
+require_once __DIR__.'/../lib/base.php';
 
 header('Content-Type: application/json');
 

apps/federatedfilesharing/composer/composer/autoload_static.php

Spacing +20 added lines, -20 removed lines

@@ -6,39 +6,39 @@
 
 class ComposerStaticInitFederatedFileSharing
 {
-    public static $prefixLengthsPsr4 = array (
+    public static $prefixLengthsPsr4 = array(
         'O' => 
-        array (
+        array(
             'OCA\\FederatedFileSharing\\' => 25,
         ),
     );
 
-    public static $prefixDirsPsr4 = array (
+    public static $prefixDirsPsr4 = array(
         'OCA\\FederatedFileSharing\\' => 
-        array (
-            0 => __DIR__ . '/..' . '/../lib',
+        array(
+            0 => __DIR__.'/..'.'/../lib',
         ),
     );
 
-    public static $classMap = array (
-        'OCA\\FederatedFileSharing\\AddressHandler' => __DIR__ . '/..' . '/../lib/AddressHandler.php',
-        'OCA\\FederatedFileSharing\\AppInfo\\Application' => __DIR__ . '/..' . '/../lib/AppInfo/Application.php',
-        'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => __DIR__ . '/..' . '/../lib/BackgroundJob/RetryJob.php',
-        'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => __DIR__ . '/..' . '/../lib/Controller/MountPublicLinkController.php',
-        'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => __DIR__ . '/..' . '/../lib/Controller/RequestHandlerController.php',
-        'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__ . '/..' . '/../lib/FederatedShareProvider.php',
-        'OCA\\FederatedFileSharing\\Notifications' => __DIR__ . '/..' . '/../lib/Notifications.php',
-        'OCA\\FederatedFileSharing\\Notifier' => __DIR__ . '/..' . '/../lib/Notifier.php',
-        'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => __DIR__ . '/..' . '/../lib/ocm/CloudFederationProviderFiles.php',
-        'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__ . '/..' . '/../lib/Settings/Admin.php',
-        'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__ . '/..' . '/../lib/Settings/Personal.php',
-        'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__ . '/..' . '/../lib/Settings/PersonalSection.php',
-        'OCA\\FederatedFileSharing\\TokenHandler' => __DIR__ . '/..' . '/../lib/TokenHandler.php',
+    public static $classMap = array(
+        'OCA\\FederatedFileSharing\\AddressHandler' => __DIR__.'/..'.'/../lib/AddressHandler.php',
+        'OCA\\FederatedFileSharing\\AppInfo\\Application' => __DIR__.'/..'.'/../lib/AppInfo/Application.php',
+        'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => __DIR__.'/..'.'/../lib/BackgroundJob/RetryJob.php',
+        'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => __DIR__.'/..'.'/../lib/Controller/MountPublicLinkController.php',
+        'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => __DIR__.'/..'.'/../lib/Controller/RequestHandlerController.php',
+        'OCA\\FederatedFileSharing\\FederatedShareProvider' => __DIR__.'/..'.'/../lib/FederatedShareProvider.php',
+        'OCA\\FederatedFileSharing\\Notifications' => __DIR__.'/..'.'/../lib/Notifications.php',
+        'OCA\\FederatedFileSharing\\Notifier' => __DIR__.'/..'.'/../lib/Notifier.php',
+        'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => __DIR__.'/..'.'/../lib/ocm/CloudFederationProviderFiles.php',
+        'OCA\\FederatedFileSharing\\Settings\\Admin' => __DIR__.'/..'.'/../lib/Settings/Admin.php',
+        'OCA\\FederatedFileSharing\\Settings\\Personal' => __DIR__.'/..'.'/../lib/Settings/Personal.php',
+        'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => __DIR__.'/..'.'/../lib/Settings/PersonalSection.php',
+        'OCA\\FederatedFileSharing\\TokenHandler' => __DIR__.'/..'.'/../lib/TokenHandler.php',
     );
 
     public static function getInitializer(ClassLoader $loader)
     {
-        return \Closure::bind(function () use ($loader) {
+        return \Closure::bind(function() use ($loader) {
             $loader->prefixLengthsPsr4 = ComposerStaticInitFederatedFileSharing::$prefixLengthsPsr4;
             $loader->prefixDirsPsr4 = ComposerStaticInitFederatedFileSharing::$prefixDirsPsr4;
             $loader->classMap = ComposerStaticInitFederatedFileSharing::$classMap;

apps/federatedfilesharing/composer/composer/autoload_classmap.php

Spacing +13 added lines, -13 removed lines

@@ -6,17 +6,17 @@
 $baseDir = $vendorDir;
 
 return array(
-    'OCA\\FederatedFileSharing\\AddressHandler' => $baseDir . '/../lib/AddressHandler.php',
-    'OCA\\FederatedFileSharing\\AppInfo\\Application' => $baseDir . '/../lib/AppInfo/Application.php',
-    'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => $baseDir . '/../lib/BackgroundJob/RetryJob.php',
-    'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => $baseDir . '/../lib/Controller/MountPublicLinkController.php',
-    'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => $baseDir . '/../lib/Controller/RequestHandlerController.php',
-    'OCA\\FederatedFileSharing\\FederatedShareProvider' => $baseDir . '/../lib/FederatedShareProvider.php',
-    'OCA\\FederatedFileSharing\\Notifications' => $baseDir . '/../lib/Notifications.php',
-    'OCA\\FederatedFileSharing\\Notifier' => $baseDir . '/../lib/Notifier.php',
-    'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => $baseDir . '/../lib/ocm/CloudFederationProviderFiles.php',
-    'OCA\\FederatedFileSharing\\Settings\\Admin' => $baseDir . '/../lib/Settings/Admin.php',
-    'OCA\\FederatedFileSharing\\Settings\\Personal' => $baseDir . '/../lib/Settings/Personal.php',
-    'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => $baseDir . '/../lib/Settings/PersonalSection.php',
-    'OCA\\FederatedFileSharing\\TokenHandler' => $baseDir . '/../lib/TokenHandler.php',
+    'OCA\\FederatedFileSharing\\AddressHandler' => $baseDir.'/../lib/AddressHandler.php',
+    'OCA\\FederatedFileSharing\\AppInfo\\Application' => $baseDir.'/../lib/AppInfo/Application.php',
+    'OCA\\FederatedFileSharing\\BackgroundJob\\RetryJob' => $baseDir.'/../lib/BackgroundJob/RetryJob.php',
+    'OCA\\FederatedFileSharing\\Controller\\MountPublicLinkController' => $baseDir.'/../lib/Controller/MountPublicLinkController.php',
+    'OCA\\FederatedFileSharing\\Controller\\RequestHandlerController' => $baseDir.'/../lib/Controller/RequestHandlerController.php',
+    'OCA\\FederatedFileSharing\\FederatedShareProvider' => $baseDir.'/../lib/FederatedShareProvider.php',
+    'OCA\\FederatedFileSharing\\Notifications' => $baseDir.'/../lib/Notifications.php',
+    'OCA\\FederatedFileSharing\\Notifier' => $baseDir.'/../lib/Notifier.php',
+    'OCA\\FederatedFileSharing\\OCM\\CloudFederationProviderFiles' => $baseDir.'/../lib/ocm/CloudFederationProviderFiles.php',
+    'OCA\\FederatedFileSharing\\Settings\\Admin' => $baseDir.'/../lib/Settings/Admin.php',
+    'OCA\\FederatedFileSharing\\Settings\\Personal' => $baseDir.'/../lib/Settings/Personal.php',
+    'OCA\\FederatedFileSharing\\Settings\\PersonalSection' => $baseDir.'/../lib/Settings/PersonalSection.php',
+    'OCA\\FederatedFileSharing\\TokenHandler' => $baseDir.'/../lib/TokenHandler.php',
 );

apps/federatedfilesharing/lib/Controller/RequestHandlerController.php

Spacing +8 added lines, -8 removed lines

@@ -148,7 +148,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;
 
@@ -183,7 +183,7 @@ 
 		} catch (ProviderCouldNotAddShareException $e) {
 			throw new OCSException($e->getMessage(), $e->getCode());
 		} 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();
@@ -205,8 +205,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 ||
@@ -241,7 +241,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()
@@ -439,7 +439,7 @@ 
 			$notification = $notificationManager->createNotification();
 			$notification->setApp('files_sharing')
 				->setUser($share['user'])
-				->setObject('remote_share', (int)$share['id']);
+				->setObject('remote_share', (int) $share['id']);
 			$notificationManager->markProcessed($notification);
 
 			$event = \OC::$server->getActivityManager()->generateEvent();
@@ -447,7 +447,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);
 		}
 
@@ -589,7 +589,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/cloud_federation_api/lib/Controller/RequestHandlerController.php

Spacing +5 added lines, -5 removed lines

@@ -137,7 +137,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
 			);
 		}
@@ -168,7 +168,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
 			);
 		}
@@ -222,7 +222,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
 			);
 		}
@@ -244,13 +244,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;
 	}

lib/public/Federation/Exceptions/ProviderDoesNotExistsException.php

Spacing +1 added lines, -1 removed lines

@@ -32,7 +32,7 @@
 	 */
 	public function __construct($providerId) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'Cloud Federation Provider with ID: "' . $providerId . '" does not exist.';
+		$message = 'Cloud Federation Provider with ID: "'.$providerId.'" does not exist.';
 		$hint = $l->t('Cloud Federation Provider with ID: "%s" does not exist.', [$providerId]);
 		parent::__construct($message, $hint);
 	}

lib/public/Federation/Exceptions/ProviderAlreadyExistsException.php

Spacing +1 added lines, -1 removed lines

@@ -33,7 +33,7 @@
 	 */
 	public function __construct($newProviderId, $existingProviderName) {
 		$l = \OC::$server->getL10N('federation');
-		$message = 'Id "' . $newProviderId . '" already used by cloud federation provider "' . $existingProviderName . '"';
+		$message = 'Id "'.$newProviderId.'" already used by cloud federation provider "'.$existingProviderName.'"';
 		$hint = $l->t('Id "%s" already used by cloud federation provider "%s"', [$newProviderId, $existingProviderName]);
 		parent::__construct($message, $hint);
 	}

apps/federatedfilesharing/lib/Notifications.php

Doc Comments +7 added lines, -3 removed lines

@@ -156,7 +156,7 @@ 
 	 * @param string $remote url
 	 * @param int $id share id
 	 * @param string $token
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendRemoteUnShare($remote, $id, $token) {
 		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
@@ -168,7 +168,7 @@ 
 	 * @param string $remote url
 	 * @param int $id share id
 	 * @param string $token
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendRevokeShare($remote, $id, $token) {
 		$this->sendUpdateToRemote($remote, $id, $token, 'revoke');
@@ -181,7 +181,7 @@ 
 	 * @param int $remoteId
 	 * @param string $token
 	 * @param int $permissions
-	 * @return bool
+	 * @return boolean|null
 	 */
 	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
 		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
@@ -342,6 +342,10 @@ 
 		return '';
 	}
 
+	/**
+	 * @param string $remoteDomain
+	 * @param string $urlSuffix
+	 */
 	protected function sendNotificationToOCMEndPoint($remoteDomain, $urlSuffix, $fields) {
 		$client = $this->httpClientService->newClient();
 		switch ($urlSuffix) {

Spacing +5 added lines, -5 removed lines

@@ -132,7 +132,7 @@ 
 			'remoteId' => $shareId
 		);
 
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$id.'/reshare', $fields);
 		$status = json_decode($result['result'], true);
 
 		$httpRequestSuccessful = $result['success'];
@@ -143,7 +143,7 @@ 
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
 			return [
 				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
+				(int) $status['ocs']['data']['remoteId']
 			];
 		}
 
@@ -227,7 +227,7 @@ 
 			$fields[$key] = $value;
 		}
 
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields);
+		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/'.$remoteId.'/'.$action, $fields);
 		$status = json_decode($result['result'], true);
 
 		if ($result['success'] &&
@@ -277,7 +277,7 @@ 
 	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields) {
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
+			$remoteDomain = 'https://'.$remoteDomain;
 		}
 
 		$result = [
@@ -299,7 +299,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,