nextcloud / server

lib/private/Files/Search/SearchQuery.php

Indentation +56 added lines, -56 removed lines

@@ -27,66 +27,66 @@
 use OCP\IUser;
 
 class SearchQuery implements ISearchQuery {
-	/** @var  ISearchOperator */
-	private $searchOperation;
-	/** @var  integer */
-	private $limit;
-	/** @var  integer */
-	private $offset;
-	/** @var  ISearchOrder[] */
-	private $order;
-	/** @var IUser */
-	private $user;
+    /** @var  ISearchOperator */
+    private $searchOperation;
+    /** @var  integer */
+    private $limit;
+    /** @var  integer */
+    private $offset;
+    /** @var  ISearchOrder[] */
+    private $order;
+    /** @var IUser */
+    private $user;
 
-	/**
-	 * SearchQuery constructor.
-	 *
-	 * @param ISearchOperator $searchOperation
-	 * @param int $limit
-	 * @param int $offset
-	 * @param array $order
-	 * @param IUser $user
-	 */
-	public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
-		$this->searchOperation = $searchOperation;
-		$this->limit = $limit;
-		$this->offset = $offset;
-		$this->order = $order;
-		$this->user = $user;
-	}
+    /**
+     * SearchQuery constructor.
+     *
+     * @param ISearchOperator $searchOperation
+     * @param int $limit
+     * @param int $offset
+     * @param array $order
+     * @param IUser $user
+     */
+    public function __construct(ISearchOperator $searchOperation, $limit, $offset, array $order, IUser $user) {
+        $this->searchOperation = $searchOperation;
+        $this->limit = $limit;
+        $this->offset = $offset;
+        $this->order = $order;
+        $this->user = $user;
+    }
 
-	/**
-	 * @return ISearchOperator
-	 */
-	public function getSearchOperation() {
-		return $this->searchOperation;
-	}
+    /**
+     * @return ISearchOperator
+     */
+    public function getSearchOperation() {
+        return $this->searchOperation;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getLimit() {
-		return $this->limit;
-	}
+    /**
+     * @return int
+     */
+    public function getLimit() {
+        return $this->limit;
+    }
 
-	/**
-	 * @return int
-	 */
-	public function getOffset() {
-		return $this->offset;
-	}
+    /**
+     * @return int
+     */
+    public function getOffset() {
+        return $this->offset;
+    }
 
-	/**
-	 * @return ISearchOrder[]
-	 */
-	public function getOrder() {
-		return $this->order;
-	}
+    /**
+     * @return ISearchOrder[]
+     */
+    public function getOrder() {
+        return $this->order;
+    }
 
-	/**
-	 * @return IUser
-	 */
-	public function getUser() {
-		return $this->user;
-	}
+    /**
+     * @return IUser
+     */
+    public function getUser() {
+        return $this->user;
+    }
 }

lib/private/Preview/MP3.php

Indentation +28 added lines, -28 removed lines

@@ -29,38 +29,38 @@
 use ID3Parser\ID3Parser;
 
 class MP3 extends Provider {
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getMimeType() {
-		return '/audio\/mpeg/';
-	}
+    /**
+     * {@inheritDoc}
+     */
+    public function getMimeType() {
+        return '/audio\/mpeg/';
+    }
 
-	/**
-	 * {@inheritDoc}
-	 */
-	public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
-		$getID3 = new ID3Parser();
+    /**
+     * {@inheritDoc}
+     */
+    public function getThumbnail($path, $maxX, $maxY, $scalingup, $fileview) {
+        $getID3 = new ID3Parser();
 
-		$tmpPath = $fileview->toTmpFile($path);
-		$tags = $getID3->analyze($tmpPath);
-		unlink($tmpPath);
-		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
-		if(is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
-			$picture = $tags['id3v2']['PIC'][0]['data'];
-		}
+        $tmpPath = $fileview->toTmpFile($path);
+        $tags = $getID3->analyze($tmpPath);
+        unlink($tmpPath);
+        $picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
+        if(is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
+            $picture = $tags['id3v2']['PIC'][0]['data'];
+        }
 
-		if(!is_null($picture)) {
-			$image = new \OC_Image();
-			$image->loadFromData($picture);
+        if(!is_null($picture)) {
+            $image = new \OC_Image();
+            $image->loadFromData($picture);
 
-			if ($image->valid()) {
-				$image->scaleDownToFit($maxX, $maxY);
+            if ($image->valid()) {
+                $image->scaleDownToFit($maxX, $maxY);
 
-				return $image;
-			}
-		}
+                return $image;
+            }
+        }
 
-		return false;
-	}
+        return false;
+    }
 }

Spacing +2 added lines, -2 removed lines

@@ -46,11 +46,11 @@
 		$tags = $getID3->analyze($tmpPath);
 		unlink($tmpPath);
 		$picture = isset($tags['id3v2']['APIC'][0]['data']) ? $tags['id3v2']['APIC'][0]['data'] : null;
-		if(is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
+		if (is_null($picture) && isset($tags['id3v2']['PIC'][0]['data'])) {
 			$picture = $tags['id3v2']['PIC'][0]['data'];
 		}
 
-		if(!is_null($picture)) {
+		if (!is_null($picture)) {
 			$image = new \OC_Image();
 			$image->loadFromData($picture);
 

apps/federatedfilesharing/appinfo/routes.php

Indentation +14 added lines, -14 removed lines

@@ -23,18 +23,18 @@
  */
 
 return [
-	'routes' => [
-		['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
-		['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
-	],
-	'ocs' => [
-		['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
-		['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
-	],
+    'routes' => [
+        ['name' => 'MountPublicLink#createFederatedShare', 'url' => '/createFederatedShare', 'verb' => 'POST'],
+        ['name' => 'MountPublicLink#askForFederatedShare', 'url' => '/askForFederatedShare', 'verb' => 'POST'],
+    ],
+    'ocs' => [
+        ['root' => '/cloud', 'name' => 'RequestHandler#createShare', 'url' => '/shares', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#reShare', 'url' => '/shares/{id}/reshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#updatePermissions', 'url' => '/shares/{id}/permissions', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#acceptShare', 'url' => '/shares/{id}/accept', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#declineShare', 'url' => '/shares/{id}/decline', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#unshare', 'url' => '/shares/{id}/unshare', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#revoke', 'url' => '/shares/{id}/revoke', 'verb' => 'POST'],
+        ['root' => '/cloud', 'name' => 'RequestHandler#move', 'url' => '/shares/{id}/move', 'verb' => 'POST'],
+    ],
 ];

apps/federatedfilesharing/lib/Notifications.php

Indentation +276 added lines, -276 removed lines

@@ -33,280 +33,280 @@
 use OCP\OCS\IDiscoveryService;
 
 class Notifications {
-	const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
-
-	/** @var AddressHandler */
-	private $addressHandler;
-
-	/** @var IClientService */
-	private $httpClientService;
-
-	/** @var IDiscoveryService */
-	private $discoveryService;
-
-	/** @var IJobList  */
-	private $jobList;
-
-	/**
-	 * @param AddressHandler $addressHandler
-	 * @param IClientService $httpClientService
-	 * @param IDiscoveryService $discoveryService
-	 * @param IJobList $jobList
-	 */
-	public function __construct(
-		AddressHandler $addressHandler,
-		IClientService $httpClientService,
-		IDiscoveryService $discoveryService,
-		IJobList $jobList
-	) {
-		$this->addressHandler = $addressHandler;
-		$this->httpClientService = $httpClientService;
-		$this->discoveryService = $discoveryService;
-		$this->jobList = $jobList;
-	}
-
-	/**
-	 * send server-to-server share to remote server
-	 *
-	 * @param string $token
-	 * @param string $shareWith
-	 * @param string $name
-	 * @param int $remote_id
-	 * @param string $owner
-	 * @param string $ownerFederatedId
-	 * @param string $sharedBy
-	 * @param string $sharedByFederatedId
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
-
-		list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
-
-		if ($user && $remote) {
-			$local = $this->addressHandler->generateRemoteURL();
-
-			$fields = array(
-				'shareWith' => $user,
-				'token' => $token,
-				'name' => $name,
-				'remoteId' => $remote_id,
-				'owner' => $owner,
-				'ownerFederatedId' => $ownerFederatedId,
-				'sharedBy' => $sharedBy,
-				'sharedByFederatedId' => $sharedByFederatedId,
-				'remote' => $local,
-			);
-
-			$result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
-			$status = json_decode($result['result'], true);
-
-			if ($result['success'] && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200)) {
-				\OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
-				return true;
-			}
-
-		}
-
-		return false;
-	}
-
-	/**
-	 * ask owner to re-share the file with the given user
-	 *
-	 * @param string $token
-	 * @param int $id remote Id
-	 * @param int $shareId internal share Id
-	 * @param string $remote remote address of the owner
-	 * @param string $shareWith
-	 * @param int $permission
-	 * @return bool
-	 * @throws \OC\HintException
-	 * @throws \OC\ServerNotAvailableException
-	 */
-	public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission) {
-
-		$fields = array(
-			'shareWith' => $shareWith,
-			'token' => $token,
-			'permission' => $permission,
-			'remoteId' => $shareId
-		);
-
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
-		$status = json_decode($result['result'], true);
-
-		$httpRequestSuccessful = $result['success'];
-		$ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
-		$validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
-		$validRemoteId = isset($status['ocs']['data']['remoteId']);
-
-		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
-			return [
-				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
-			];
-		}
-
-		return false;
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRemoteUnShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'unshare');
-	}
-
-	/**
-	 * send server-to-server unshare to remote server
-	 *
-	 * @param string $remote url
-	 * @param int $id share id
-	 * @param string $token
-	 * @return bool
-	 */
-	public function sendRevokeShare($remote, $id, $token) {
-		$this->sendUpdateToRemote($remote, $id, $token, 'revoke');
-	}
-
-	/**
-	 * send notification to remote server if the permissions was changed
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 * @param int $permissions
-	 * @return bool
-	 */
-	public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
-	}
-
-	/**
-	 * forward accept reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendAcceptShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
-	}
-
-	/**
-	 * forward decline reShare to remote server
-	 *
-	 * @param string $remote
-	 * @param int $remoteId
-	 * @param string $token
-	 */
-	public function sendDeclineShare($remote, $remoteId, $token) {
-		$this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
-	}
-
-	/**
-	 * inform remote server whether server-to-server share was accepted/declined
-	 *
-	 * @param string $remote
-	 * @param string $token
-	 * @param int $remoteId Share id on the remote host
-	 * @param string $action possible actions: accept, decline, unshare, revoke, permissions
-	 * @param array $data
-	 * @param int $try
-	 * @return boolean
-	 */
-	public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
-
-		$fields = array('token' => $token);
-		foreach ($data as $key => $value) {
-			$fields[$key] = $value;
-		}
-
-		$result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields);
-		$status = json_decode($result['result'], true);
-
-		if ($result['success'] &&
-			($status['ocs']['meta']['statuscode'] === 100 ||
-				$status['ocs']['meta']['statuscode'] === 200
-			)
-		) {
-			return true;
-		} elseif ($try === 0) {
-			// only add new job on first try
-			$this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
-				[
-					'remote' => $remote,
-					'remoteId' => $remoteId,
-					'token' => $token,
-					'action' => $action,
-					'data' => json_encode($data),
-					'try' => $try,
-					'lastRun' => $this->getTimestamp()
-				]
-			);
-		}
-
-		return false;
-	}
-
-
-	/**
-	 * return current timestamp
-	 *
-	 * @return int
-	 */
-	protected function getTimestamp() {
-		return time();
-	}
-
-	/**
-	 * try http post with the given protocol, if no protocol is given we pick
-	 * the secure one (https)
-	 *
-	 * @param string $remoteDomain
-	 * @param string $urlSuffix
-	 * @param array $fields post parameters
-	 * @return array
-	 * @throws \Exception
-	 */
-	protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields) {
-		$client = $this->httpClientService->newClient();
-
-		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
-		}
-
-		$result = [
-			'success' => false,
-			'result' => '',
-		];
-
-		$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, [
-				'body' => $fields,
-				'timeout' => 10,
-				'connect_timeout' => 10,
-			]);
-			$result['result'] = $response->getBody();
-			$result['success'] = true;
-		} catch (\Exception $e) {
-			// if flat re-sharing is not supported by the remote server
-			// we re-throw the exception and fall back to the old behaviour.
-			// (flat re-shares has been introduced in Nextcloud 9.1)
-			if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
-				throw $e;
-			}
-		}
-
-		return $result;
-	}
+    const RESPONSE_FORMAT = 'json'; // default response format for ocs calls
+
+    /** @var AddressHandler */
+    private $addressHandler;
+
+    /** @var IClientService */
+    private $httpClientService;
+
+    /** @var IDiscoveryService */
+    private $discoveryService;
+
+    /** @var IJobList  */
+    private $jobList;
+
+    /**
+     * @param AddressHandler $addressHandler
+     * @param IClientService $httpClientService
+     * @param IDiscoveryService $discoveryService
+     * @param IJobList $jobList
+     */
+    public function __construct(
+        AddressHandler $addressHandler,
+        IClientService $httpClientService,
+        IDiscoveryService $discoveryService,
+        IJobList $jobList
+    ) {
+        $this->addressHandler = $addressHandler;
+        $this->httpClientService = $httpClientService;
+        $this->discoveryService = $discoveryService;
+        $this->jobList = $jobList;
+    }
+
+    /**
+     * send server-to-server share to remote server
+     *
+     * @param string $token
+     * @param string $shareWith
+     * @param string $name
+     * @param int $remote_id
+     * @param string $owner
+     * @param string $ownerFederatedId
+     * @param string $sharedBy
+     * @param string $sharedByFederatedId
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function sendRemoteShare($token, $shareWith, $name, $remote_id, $owner, $ownerFederatedId, $sharedBy, $sharedByFederatedId) {
+
+        list($user, $remote) = $this->addressHandler->splitUserRemote($shareWith);
+
+        if ($user && $remote) {
+            $local = $this->addressHandler->generateRemoteURL();
+
+            $fields = array(
+                'shareWith' => $user,
+                'token' => $token,
+                'name' => $name,
+                'remoteId' => $remote_id,
+                'owner' => $owner,
+                'ownerFederatedId' => $ownerFederatedId,
+                'sharedBy' => $sharedBy,
+                'sharedByFederatedId' => $sharedByFederatedId,
+                'remote' => $local,
+            );
+
+            $result = $this->tryHttpPostToShareEndpoint($remote, '', $fields);
+            $status = json_decode($result['result'], true);
+
+            if ($result['success'] && ($status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200)) {
+                \OC_Hook::emit('OCP\Share', 'federated_share_added', ['server' => $remote]);
+                return true;
+            }
+
+        }
+
+        return false;
+    }
+
+    /**
+     * ask owner to re-share the file with the given user
+     *
+     * @param string $token
+     * @param int $id remote Id
+     * @param int $shareId internal share Id
+     * @param string $remote remote address of the owner
+     * @param string $shareWith
+     * @param int $permission
+     * @return bool
+     * @throws \OC\HintException
+     * @throws \OC\ServerNotAvailableException
+     */
+    public function requestReShare($token, $id, $shareId, $remote, $shareWith, $permission) {
+
+        $fields = array(
+            'shareWith' => $shareWith,
+            'token' => $token,
+            'permission' => $permission,
+            'remoteId' => $shareId
+        );
+
+        $result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $id . '/reshare', $fields);
+        $status = json_decode($result['result'], true);
+
+        $httpRequestSuccessful = $result['success'];
+        $ocsCallSuccessful = $status['ocs']['meta']['statuscode'] === 100 || $status['ocs']['meta']['statuscode'] === 200;
+        $validToken = isset($status['ocs']['data']['token']) && is_string($status['ocs']['data']['token']);
+        $validRemoteId = isset($status['ocs']['data']['remoteId']);
+
+        if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
+            return [
+                $status['ocs']['data']['token'],
+                (int)$status['ocs']['data']['remoteId']
+            ];
+        }
+
+        return false;
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRemoteUnShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'unshare');
+    }
+
+    /**
+     * send server-to-server unshare to remote server
+     *
+     * @param string $remote url
+     * @param int $id share id
+     * @param string $token
+     * @return bool
+     */
+    public function sendRevokeShare($remote, $id, $token) {
+        $this->sendUpdateToRemote($remote, $id, $token, 'revoke');
+    }
+
+    /**
+     * send notification to remote server if the permissions was changed
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     * @param int $permissions
+     * @return bool
+     */
+    public function sendPermissionChange($remote, $remoteId, $token, $permissions) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'permissions', ['permissions' => $permissions]);
+    }
+
+    /**
+     * forward accept reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendAcceptShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'accept');
+    }
+
+    /**
+     * forward decline reShare to remote server
+     *
+     * @param string $remote
+     * @param int $remoteId
+     * @param string $token
+     */
+    public function sendDeclineShare($remote, $remoteId, $token) {
+        $this->sendUpdateToRemote($remote, $remoteId, $token, 'decline');
+    }
+
+    /**
+     * inform remote server whether server-to-server share was accepted/declined
+     *
+     * @param string $remote
+     * @param string $token
+     * @param int $remoteId Share id on the remote host
+     * @param string $action possible actions: accept, decline, unshare, revoke, permissions
+     * @param array $data
+     * @param int $try
+     * @return boolean
+     */
+    public function sendUpdateToRemote($remote, $remoteId, $token, $action, $data = [], $try = 0) {
+
+        $fields = array('token' => $token);
+        foreach ($data as $key => $value) {
+            $fields[$key] = $value;
+        }
+
+        $result = $this->tryHttpPostToShareEndpoint(rtrim($remote, '/'), '/' . $remoteId . '/' . $action, $fields);
+        $status = json_decode($result['result'], true);
+
+        if ($result['success'] &&
+            ($status['ocs']['meta']['statuscode'] === 100 ||
+                $status['ocs']['meta']['statuscode'] === 200
+            )
+        ) {
+            return true;
+        } elseif ($try === 0) {
+            // only add new job on first try
+            $this->jobList->add('OCA\FederatedFileSharing\BackgroundJob\RetryJob',
+                [
+                    'remote' => $remote,
+                    'remoteId' => $remoteId,
+                    'token' => $token,
+                    'action' => $action,
+                    'data' => json_encode($data),
+                    'try' => $try,
+                    'lastRun' => $this->getTimestamp()
+                ]
+            );
+        }
+
+        return false;
+    }
+
+
+    /**
+     * return current timestamp
+     *
+     * @return int
+     */
+    protected function getTimestamp() {
+        return time();
+    }
+
+    /**
+     * try http post with the given protocol, if no protocol is given we pick
+     * the secure one (https)
+     *
+     * @param string $remoteDomain
+     * @param string $urlSuffix
+     * @param array $fields post parameters
+     * @return array
+     * @throws \Exception
+     */
+    protected function tryHttpPostToShareEndpoint($remoteDomain, $urlSuffix, array $fields) {
+        $client = $this->httpClientService->newClient();
+
+        if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
+            $remoteDomain = 'https://' . $remoteDomain;
+        }
+
+        $result = [
+            'success' => false,
+            'result' => '',
+        ];
+
+        $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, [
+                'body' => $fields,
+                'timeout' => 10,
+                'connect_timeout' => 10,
+            ]);
+            $result['result'] = $response->getBody();
+            $result['success'] = true;
+        } catch (\Exception $e) {
+            // if flat re-sharing is not supported by the remote server
+            // we re-throw the exception and fall back to the old behaviour.
+            // (flat re-shares has been introduced in Nextcloud 9.1)
+            if ($e->getCode() === Http::STATUS_INTERNAL_SERVER_ERROR) {
+                throw $e;
+            }
+        }
+
+        return $result;
+    }
 }

Spacing +5 added lines, -5 removed lines

@@ -134,7 +134,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'];
@@ -145,7 +145,7 @@ 
 		if ($httpRequestSuccessful && $ocsCallSuccessful && $validToken && $validRemoteId) {
 			return [
 				$status['ocs']['data']['token'],
-				(int)$status['ocs']['data']['remoteId']
+				(int) $status['ocs']['data']['remoteId']
 			];
 		}
 
@@ -229,7 +229,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'] &&
@@ -280,7 +280,7 @@ 
 		$client = $this->httpClientService->newClient();
 
 		if ($this->addressHandler->urlContainProtocol($remoteDomain) === false) {
-			$remoteDomain = 'https://' . $remoteDomain;
+			$remoteDomain = 'https://'.$remoteDomain;
 		}
 
 		$result = [
@@ -291,7 +291,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,

apps/dav/appinfo/v2/remote.php

Indentation +1 added lines, -1 removed lines

@@ -21,7 +21,7 @@
  */
 // no php execution timeout for webdav
 if (strpos(@ini_get('disable_functions'), 'set_time_limit') === false) {
-	@set_time_limit(0);
+    @set_time_limit(0);
 }
 ignore_user_abort(true);
 

lib/private/Share20/ProviderFactory.php

Spacing +2 added lines, -2 removed lines

@@ -214,7 +214,7 @@ 
 		}
 
 		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
+			throw new ProviderException('No provider with id .'.$id.' found.');
 		}
 
 		return $provider;
@@ -241,7 +241,7 @@ 
 
 
 		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
+			throw new ProviderException('No share provider for share type '.$shareType);
 		}
 
 		return $provider;

Doc Comments +1 added lines, -1 removed lines

@@ -176,7 +176,7 @@
 	/**
 	 * Create the circle share provider
 	 *
-	 * @return FederatedShareProvider
+	 * @return null|\OCA\Circles\ShareByCircleProvider
 	 *
 	 * @suppress PhanUndeclaredClassMethod
 	 */

Indentation +222 added lines, -222 removed lines

@@ -43,233 +43,233 @@
  */
 class ProviderFactory implements IProviderFactory {
 
-	/** @var IServerContainer */
-	private $serverContainer;
-	/** @var DefaultShareProvider */
-	private $defaultProvider = null;
-	/** @var FederatedShareProvider */
-	private $federatedProvider = null;
-	/** @var  ShareByMailProvider */
-	private $shareByMailProvider;
-	/** @var  \OCA\Circles\ShareByCircleProvider */
-	private $shareByCircleProvider = null;
-	/** @var bool */
-	private $circlesAreNotAvailable = false;
-
-	/**
-	 * IProviderFactory constructor.
-	 *
-	 * @param IServerContainer $serverContainer
-	 */
-	public function __construct(IServerContainer $serverContainer) {
-		$this->serverContainer = $serverContainer;
-	}
-
-	/**
-	 * Create the default share provider.
-	 *
-	 * @return DefaultShareProvider
-	 */
-	protected function defaultShareProvider() {
-		if ($this->defaultProvider === null) {
-			$this->defaultProvider = new DefaultShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getGroupManager(),
-				$this->serverContainer->getLazyRootFolder()
-			);
-		}
-
-		return $this->defaultProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return FederatedShareProvider
-	 */
-	protected function federatedShareProvider() {
-		if ($this->federatedProvider === null) {
-			/*
+    /** @var IServerContainer */
+    private $serverContainer;
+    /** @var DefaultShareProvider */
+    private $defaultProvider = null;
+    /** @var FederatedShareProvider */
+    private $federatedProvider = null;
+    /** @var  ShareByMailProvider */
+    private $shareByMailProvider;
+    /** @var  \OCA\Circles\ShareByCircleProvider */
+    private $shareByCircleProvider = null;
+    /** @var bool */
+    private $circlesAreNotAvailable = false;
+
+    /**
+     * IProviderFactory constructor.
+     *
+     * @param IServerContainer $serverContainer
+     */
+    public function __construct(IServerContainer $serverContainer) {
+        $this->serverContainer = $serverContainer;
+    }
+
+    /**
+     * Create the default share provider.
+     *
+     * @return DefaultShareProvider
+     */
+    protected function defaultShareProvider() {
+        if ($this->defaultProvider === null) {
+            $this->defaultProvider = new DefaultShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getGroupManager(),
+                $this->serverContainer->getLazyRootFolder()
+            );
+        }
+
+        return $this->defaultProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return FederatedShareProvider
+     */
+    protected function federatedShareProvider() {
+        if ($this->federatedProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('federatedfilesharing')) {
-				return null;
-			}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('federatedfilesharing')) {
+                return null;
+            }
 
-			/*
+            /*
 			 * TODO: add factory to federated sharing app
 			 */
-			$l = $this->serverContainer->getL10N('federatedfilessharing');
-			$addressHandler = new AddressHandler(
-				$this->serverContainer->getURLGenerator(),
-				$l,
-				$this->serverContainer->getCloudIdManager()
-			);
-			$notifications = new Notifications(
-				$addressHandler,
-				$this->serverContainer->getHTTPClientService(),
-				$this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
-				$this->serverContainer->getJobList()
-			);
-			$tokenHandler = new TokenHandler(
-				$this->serverContainer->getSecureRandom()
-			);
-
-			$this->federatedProvider = new FederatedShareProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$addressHandler,
-				$notifications,
-				$tokenHandler,
-				$l,
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getConfig(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getCloudIdManager(),
-				$this->serverContainer->query(Config::class)
-			);
-		}
-
-		return $this->federatedProvider;
-	}
-
-	/**
-	 * Create the federated share provider
-	 *
-	 * @return ShareByMailProvider
-	 */
-	protected function getShareByMailProvider() {
-		if ($this->shareByMailProvider === null) {
-			/*
+            $l = $this->serverContainer->getL10N('federatedfilessharing');
+            $addressHandler = new AddressHandler(
+                $this->serverContainer->getURLGenerator(),
+                $l,
+                $this->serverContainer->getCloudIdManager()
+            );
+            $notifications = new Notifications(
+                $addressHandler,
+                $this->serverContainer->getHTTPClientService(),
+                $this->serverContainer->query(\OCP\OCS\IDiscoveryService::class),
+                $this->serverContainer->getJobList()
+            );
+            $tokenHandler = new TokenHandler(
+                $this->serverContainer->getSecureRandom()
+            );
+
+            $this->federatedProvider = new FederatedShareProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $addressHandler,
+                $notifications,
+                $tokenHandler,
+                $l,
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getConfig(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getCloudIdManager(),
+                $this->serverContainer->query(Config::class)
+            );
+        }
+
+        return $this->federatedProvider;
+    }
+
+    /**
+     * Create the federated share provider
+     *
+     * @return ShareByMailProvider
+     */
+    protected function getShareByMailProvider() {
+        if ($this->shareByMailProvider === null) {
+            /*
 			 * Check if the app is enabled
 			 */
-			$appManager = $this->serverContainer->getAppManager();
-			if (!$appManager->isEnabledForUser('sharebymail')) {
-				return null;
-			}
-
-			$settingsManager = new SettingsManager($this->serverContainer->getConfig());
-
-			$this->shareByMailProvider = new ShareByMailProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('sharebymail'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getMailer(),
-				$this->serverContainer->getURLGenerator(),
-				$this->serverContainer->getActivityManager(),
-				$settingsManager,
-				$this->serverContainer->query(Defaults::class),
-				$this->serverContainer->getHasher(),
-				$this->serverContainer->query(CapabilitiesManager::class)
-			);
-		}
-
-		return $this->shareByMailProvider;
-	}
-
-
-	/**
-	 * Create the circle share provider
-	 *
-	 * @return FederatedShareProvider
-	 *
-	 * @suppress PhanUndeclaredClassMethod
-	 */
-	protected function getShareByCircleProvider() {
-
-		if ($this->circlesAreNotAvailable) {
-			return null;
-		}
-
-		if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
-			!class_exists('\OCA\Circles\ShareByCircleProvider')
-		) {
-			$this->circlesAreNotAvailable = true;
-			return null;
-		}
-
-		if ($this->shareByCircleProvider === null) {
-
-			$this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
-				$this->serverContainer->getDatabaseConnection(),
-				$this->serverContainer->getSecureRandom(),
-				$this->serverContainer->getUserManager(),
-				$this->serverContainer->getLazyRootFolder(),
-				$this->serverContainer->getL10N('circles'),
-				$this->serverContainer->getLogger(),
-				$this->serverContainer->getURLGenerator()
-			);
-		}
-
-		return $this->shareByCircleProvider;
-	}
-
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProvider($id) {
-		$provider = null;
-		if ($id === 'ocinternal') {
-			$provider = $this->defaultShareProvider();
-		} else if ($id === 'ocFederatedSharing') {
-			$provider = $this->federatedShareProvider();
-		} else if ($id === 'ocMailShare') {
-			$provider = $this->getShareByMailProvider();
-		} else if ($id === 'ocCircleShare') {
-			$provider = $this->getShareByCircleProvider();
-		}
-
-		if ($provider === null) {
-			throw new ProviderException('No provider with id .' . $id . ' found.');
-		}
-
-		return $provider;
-	}
-
-	/**
-	 * @inheritdoc
-	 */
-	public function getProviderForType($shareType) {
-		$provider = null;
-
-		if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
-			$shareType === \OCP\Share::SHARE_TYPE_GROUP ||
-			$shareType === \OCP\Share::SHARE_TYPE_LINK
-		) {
-			$provider = $this->defaultShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
-			$provider = $this->federatedShareProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
-			$provider = $this->getShareByMailProvider();
-		} else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
-			$provider = $this->getShareByCircleProvider();
-		}
-
-
-		if ($provider === null) {
-			throw new ProviderException('No share provider for share type ' . $shareType);
-		}
-
-		return $provider;
-	}
-
-	public function getAllProviders() {
-		$shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
-		$shareByMail = $this->getShareByMailProvider();
-		if ($shareByMail !== null) {
-			$shares[] = $shareByMail;
-		}
-		$shareByCircle = $this->getShareByCircleProvider();
-		if ($shareByCircle !== null) {
-			$shares[] = $shareByCircle;
-		}
-
-		return $shares;
-	}
+            $appManager = $this->serverContainer->getAppManager();
+            if (!$appManager->isEnabledForUser('sharebymail')) {
+                return null;
+            }
+
+            $settingsManager = new SettingsManager($this->serverContainer->getConfig());
+
+            $this->shareByMailProvider = new ShareByMailProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('sharebymail'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getMailer(),
+                $this->serverContainer->getURLGenerator(),
+                $this->serverContainer->getActivityManager(),
+                $settingsManager,
+                $this->serverContainer->query(Defaults::class),
+                $this->serverContainer->getHasher(),
+                $this->serverContainer->query(CapabilitiesManager::class)
+            );
+        }
+
+        return $this->shareByMailProvider;
+    }
+
+
+    /**
+     * Create the circle share provider
+     *
+     * @return FederatedShareProvider
+     *
+     * @suppress PhanUndeclaredClassMethod
+     */
+    protected function getShareByCircleProvider() {
+
+        if ($this->circlesAreNotAvailable) {
+            return null;
+        }
+
+        if (!$this->serverContainer->getAppManager()->isEnabledForUser('circles') ||
+            !class_exists('\OCA\Circles\ShareByCircleProvider')
+        ) {
+            $this->circlesAreNotAvailable = true;
+            return null;
+        }
+
+        if ($this->shareByCircleProvider === null) {
+
+            $this->shareByCircleProvider = new \OCA\Circles\ShareByCircleProvider(
+                $this->serverContainer->getDatabaseConnection(),
+                $this->serverContainer->getSecureRandom(),
+                $this->serverContainer->getUserManager(),
+                $this->serverContainer->getLazyRootFolder(),
+                $this->serverContainer->getL10N('circles'),
+                $this->serverContainer->getLogger(),
+                $this->serverContainer->getURLGenerator()
+            );
+        }
+
+        return $this->shareByCircleProvider;
+    }
+
+
+    /**
+     * @inheritdoc
+     */
+    public function getProvider($id) {
+        $provider = null;
+        if ($id === 'ocinternal') {
+            $provider = $this->defaultShareProvider();
+        } else if ($id === 'ocFederatedSharing') {
+            $provider = $this->federatedShareProvider();
+        } else if ($id === 'ocMailShare') {
+            $provider = $this->getShareByMailProvider();
+        } else if ($id === 'ocCircleShare') {
+            $provider = $this->getShareByCircleProvider();
+        }
+
+        if ($provider === null) {
+            throw new ProviderException('No provider with id .' . $id . ' found.');
+        }
+
+        return $provider;
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function getProviderForType($shareType) {
+        $provider = null;
+
+        if ($shareType === \OCP\Share::SHARE_TYPE_USER ||
+            $shareType === \OCP\Share::SHARE_TYPE_GROUP ||
+            $shareType === \OCP\Share::SHARE_TYPE_LINK
+        ) {
+            $provider = $this->defaultShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_REMOTE) {
+            $provider = $this->federatedShareProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_EMAIL) {
+            $provider = $this->getShareByMailProvider();
+        } else if ($shareType === \OCP\Share::SHARE_TYPE_CIRCLE) {
+            $provider = $this->getShareByCircleProvider();
+        }
+
+
+        if ($provider === null) {
+            throw new ProviderException('No share provider for share type ' . $shareType);
+        }
+
+        return $provider;
+    }
+
+    public function getAllProviders() {
+        $shares = [$this->defaultShareProvider(), $this->federatedShareProvider()];
+        $shareByMail = $this->getShareByMailProvider();
+        if ($shareByMail !== null) {
+            $shares[] = $shareByMail;
+        }
+        $shareByCircle = $this->getShareByCircleProvider();
+        if ($shareByCircle !== null) {
+            $shares[] = $shareByCircle;
+        }
+
+        return $shares;
+    }
 }

apps/systemtags/appinfo/app.php

Spacing +1 added lines, -1 removed lines

@@ -65,7 +65,7 @@
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
-\OCA\Files\App::getNavigationManager()->add(function () {
+\OCA\Files\App::getNavigationManager()->add(function() {
 	$l = \OC::$server->getL10N('systemtags');
 	return [
 		'id' => 'systemtagsfilter',

Indentation +25 added lines, -25 removed lines

@@ -30,22 +30,22 @@ 
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		// FIXME: no public API for these ?
-		\OCP\Util::addScript('oc-backbone-webdav');
-		\OCP\Util::addScript('systemtags/merged');
-		\OCP\Util::addScript('systemtags', 'merged');
-		\OCP\Util::addStyle('systemtags');
-		\OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        // FIXME: no public API for these ?
+        \OCP\Util::addScript('oc-backbone-webdav');
+        \OCP\Util::addScript('systemtags/merged');
+        \OCP\Util::addScript('systemtags', 'merged');
+        \OCP\Util::addStyle('systemtags');
+        \OCP\Util::addStyle('systemtags', 'systemtagsfilelist');
+    }
 );
 
 $managerListener = function(ManagerEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->event($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->event($event);
 };
 
 $eventDispatcher->addListener(ManagerEvent::EVENT_CREATE, $managerListener);
@@ -53,23 +53,23 @@ 
 $eventDispatcher->addListener(ManagerEvent::EVENT_UPDATE, $managerListener);
 
 $mapperListener = function(MapperEvent $event) {
-	$application = new \OCP\AppFramework\App('systemtags');
-	/** @var \OCA\SystemTags\Activity\Listener $listener */
-	$listener = $application->getContainer()->query(Listener::class);
-	$listener->mapperEvent($event);
+    $application = new \OCP\AppFramework\App('systemtags');
+    /** @var \OCA\SystemTags\Activity\Listener $listener */
+    $listener = $application->getContainer()->query(Listener::class);
+    $listener->mapperEvent($event);
 };
 
 $eventDispatcher->addListener(MapperEvent::EVENT_ASSIGN, $mapperListener);
 $eventDispatcher->addListener(MapperEvent::EVENT_UNASSIGN, $mapperListener);
 
 \OCA\Files\App::getNavigationManager()->add(function () {
-	$l = \OC::$server->getL10N('systemtags');
-	return [
-		'id' => 'systemtagsfilter',
-		'appname' => 'systemtags',
-		'script' => 'list.php',
-		'order' => 25,
-		'name' => $l->t('Tags'),
-	];
+    $l = \OC::$server->getL10N('systemtags');
+    return [
+        'id' => 'systemtagsfilter',
+        'appname' => 'systemtags',
+        'script' => 'list.php',
+        'order' => 25,
+        'name' => $l->t('Tags'),
+    ];
 });
 

apps/federatedfilesharing/appinfo/app.php

Indentation +12 added lines, -12 removed lines

@@ -30,22 +30,22 @@
 
 $manager = \OC::$server->getNotificationManager();
 $manager->registerNotifier(function() {
-	return \OC::$server->query(Notifier::class);
+    return \OC::$server->query(Notifier::class);
 }, function() {
-	$l = \OC::$server->getL10N('files_sharing');
-	return [
-		'id' => 'files_sharing',
-		'name' => $l->t('Federated sharing'),
-	];
+    $l = \OC::$server->getL10N('files_sharing');
+    return [
+        'id' => 'files_sharing',
+        'name' => $l->t('Federated sharing'),
+    ];
 });
 
 $federatedShareProvider = $app->getFederatedShareProvider();
 
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() use ($federatedShareProvider) {
-		if ($federatedShareProvider->isIncomingServer2serverShareEnabled()) {
-			\OCP\Util::addScript('federatedfilesharing', 'external');
-		}
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() use ($federatedShareProvider) {
+        if ($federatedShareProvider->isIncomingServer2serverShareEnabled()) {
+            \OCP\Util::addScript('federatedfilesharing', 'external');
+        }
+    }
 );

apps/files_sharing/appinfo/app.php

Spacing +3 added lines, -3 removed lines

@@ -50,7 +50,7 @@ 
 
 $config = \OC::$server->getConfig();
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
-	\OCA\Files\App::getNavigationManager()->add(function () {
+	\OCA\Files\App::getNavigationManager()->add(function() {
 		$l = \OC::$server->getL10N('files_sharing');
 		return [
 			'id' => 'sharingin',
@@ -62,7 +62,7 @@ 
 	});
 
 	if (\OCP\Util::isSharingDisabledForUser() === false) {
-		\OCA\Files\App::getNavigationManager()->add(function () {
+		\OCA\Files\App::getNavigationManager()->add(function() {
 			$l = \OC::$server->getL10N('files_sharing');
 			return [
 				'id' => 'sharingout',
@@ -75,7 +75,7 @@ 
 
 		// Check if sharing by link is enabled
 		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-			\OCA\Files\App::getNavigationManager()->add(function () {
+			\OCA\Files\App::getNavigationManager()->add(function() {
 				$l = \OC::$server->getL10N('files_sharing');
 				return [
 					'id' => 'sharinglinks',

Indentation +40 added lines, -40 removed lines

@@ -36,50 +36,50 @@
 
 $eventDispatcher = \OC::$server->getEventDispatcher();
 $eventDispatcher->addListener(
-	'OCA\Files::loadAdditionalScripts',
-	function() {
-		\OCP\Util::addStyle('files_sharing', 'mergedAdditionalStyles');
-		\OCP\Util::addScript('files_sharing', 'additionalScripts');
-	}
+    'OCA\Files::loadAdditionalScripts',
+    function() {
+        \OCP\Util::addStyle('files_sharing', 'mergedAdditionalStyles');
+        \OCP\Util::addScript('files_sharing', 'additionalScripts');
+    }
 );
 
 $config = \OC::$server->getConfig();
 if ($config->getAppValue('core', 'shareapi_enabled', 'yes') === 'yes') {
-	\OCA\Files\App::getNavigationManager()->add(function () {
-		$l = \OC::$server->getL10N('files_sharing');
-		return [
-			'id' => 'sharingin',
-			'appname' => 'files_sharing',
-			'script' => 'list.php',
-			'order' => 15,
-			'name' => $l->t('Shared with you'),
-		];
-	});
+    \OCA\Files\App::getNavigationManager()->add(function () {
+        $l = \OC::$server->getL10N('files_sharing');
+        return [
+            'id' => 'sharingin',
+            'appname' => 'files_sharing',
+            'script' => 'list.php',
+            'order' => 15,
+            'name' => $l->t('Shared with you'),
+        ];
+    });
 
-	if (\OCP\Util::isSharingDisabledForUser() === false) {
-		\OCA\Files\App::getNavigationManager()->add(function () {
-			$l = \OC::$server->getL10N('files_sharing');
-			return [
-				'id' => 'sharingout',
-				'appname' => 'files_sharing',
-				'script' => 'list.php',
-				'order' => 16,
-				'name' => $l->t('Shared with others'),
-			];
-		});
+    if (\OCP\Util::isSharingDisabledForUser() === false) {
+        \OCA\Files\App::getNavigationManager()->add(function () {
+            $l = \OC::$server->getL10N('files_sharing');
+            return [
+                'id' => 'sharingout',
+                'appname' => 'files_sharing',
+                'script' => 'list.php',
+                'order' => 16,
+                'name' => $l->t('Shared with others'),
+            ];
+        });
 
-		// Check if sharing by link is enabled
-		if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
-			\OCA\Files\App::getNavigationManager()->add(function () {
-				$l = \OC::$server->getL10N('files_sharing');
-				return [
-					'id' => 'sharinglinks',
-					'appname' => 'files_sharing',
-					'script' => 'list.php',
-					'order' => 17,
-					'name' => $l->t('Shared by link'),
-				];
-			});
-		}
-	}
+        // Check if sharing by link is enabled
+        if ($config->getAppValue('core', 'shareapi_allow_links', 'yes') === 'yes') {
+            \OCA\Files\App::getNavigationManager()->add(function () {
+                $l = \OC::$server->getL10N('files_sharing');
+                return [
+                    'id' => 'sharinglinks',
+                    'appname' => 'files_sharing',
+                    'script' => 'list.php',
+                    'order' => 17,
+                    'name' => $l->t('Shared by link'),
+                ];
+            });
+        }
+    }
 }