diff options
Diffstat (limited to 'apps/files_sharing/lib/Controller')
7 files changed, 6 insertions, 21 deletions
diff --git a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php index fc58b5d1209..89a5e0e02aa 100644 --- a/apps/files_sharing/lib/Controller/DeletedShareAPIController.php +++ b/apps/files_sharing/lib/Controller/DeletedShareAPIController.php @@ -93,7 +93,6 @@ class DeletedShareAPIController extends OCSController { * @suppress PhanUndeclaredClassMethod */ private function formatShare(IShare $share): array { - $result = [ 'id' => $share->getFullId(), 'share_type' => $share->getShareType(), @@ -154,7 +153,6 @@ class DeletedShareAPIController extends OCSController { } return $result; - } /** diff --git a/apps/files_sharing/lib/Controller/ExternalSharesController.php b/apps/files_sharing/lib/Controller/ExternalSharesController.php index 0a26f8f9f56..c5dd21cda30 100644 --- a/apps/files_sharing/lib/Controller/ExternalSharesController.php +++ b/apps/files_sharing/lib/Controller/ExternalSharesController.php @@ -151,5 +151,4 @@ class ExternalSharesController extends Controller { return new DataResponse(false); } } - } diff --git a/apps/files_sharing/lib/Controller/PublicPreviewController.php b/apps/files_sharing/lib/Controller/PublicPreviewController.php index d0c2296f0db..0e58057351f 100644 --- a/apps/files_sharing/lib/Controller/PublicPreviewController.php +++ b/apps/files_sharing/lib/Controller/PublicPreviewController.php @@ -96,7 +96,6 @@ class PublicPreviewController extends PublicShareController { int $y = 32, $a = false ) { - if ($token === '' || $x === 0 || $y === 0) { return new DataResponse([], Http::STATUS_BAD_REQUEST); } diff --git a/apps/files_sharing/lib/Controller/ShareAPIController.php b/apps/files_sharing/lib/Controller/ShareAPIController.php index 40a9a387dde..37dc76faaaf 100644 --- a/apps/files_sharing/lib/Controller/ShareAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareAPIController.php @@ -270,7 +270,8 @@ class ShareAPIController extends OCSController { try { $result = array_merge($result, $this->getRoomShareHelper()->formatShare($share)); - } catch (QueryException $e) {} + } catch (QueryException $e) { + } } @@ -594,7 +595,6 @@ class ShareAPIController extends OCSController { * @return array */ private function getSharedWithMe($node, bool $includeTags): array { - $userShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_USER, $node, -1, 0); $groupShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_GROUP, $node, -1, 0); $circleShares = $this->shareManager->getSharedWith($this->currentUser, Share::SHARE_TYPE_CIRCLE, $node, -1, 0); @@ -709,7 +709,6 @@ class ShareAPIController extends OCSController { string $path = '', string $include_tags = 'false' ): DataResponse { - $node = null; if ($path !== '') { $userFolder = $this->rootFolder->getUserFolder($this->currentUser); @@ -754,7 +753,6 @@ class ShareAPIController extends OCSController { string $viewer, $node = null, bool $sharedWithMe = false, bool $reShares = false, bool $subFiles = false, bool $includeTags = false ): array { - if ($sharedWithMe) { return $this->getSharedWithMe($node, $includeTags); } @@ -1463,7 +1461,6 @@ class ShareAPIController extends OCSController { * @return IShare[] */ private function getSharesFromNode(string $viewer, $node, bool $reShares): array { - $providers = [ Share::SHARE_TYPE_USER, Share::SHARE_TYPE_GROUP, @@ -1580,7 +1577,6 @@ class ShareAPIController extends OCSController { if ($share->getShareType() === \OCP\Share::SHARE_TYPE_CIRCLE && \OC::$server->getAppManager()->isEnabledForUser('circles') && class_exists('\OCA\Circles\Api\v1\Circles')) { - $hasCircleId = (substr($share->getSharedWith(), -1) === ']'); $shareWithStart = ($hasCircleId ? strrpos($share->getSharedWith(), '[') + 1 : 0); $shareWithLength = ($hasCircleId ? -1 : strpos($share->getSharedWith(), ' ')); @@ -1655,5 +1651,4 @@ class ShareAPIController extends OCSController { } } } - } diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 48914e27771..2ea57068f25 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -250,7 +250,7 @@ class ShareController extends AuthPublicShareController { $itemType = $itemSource = $uidOwner = ''; $token = $share; $exception = null; - if($share instanceof \OCP\Share\IShare) { + if ($share instanceof \OCP\Share\IShare) { try { $token = $share->getToken(); $uidOwner = $share->getSharedBy(); @@ -269,7 +269,7 @@ class ShareController extends AuthPublicShareController { 'errorCode' => $errorCode, 'errorMessage' => $errorMessage, ]); - if(!is_null($exception)) { + if (!is_null($exception)) { throw $exception; } } @@ -366,7 +366,6 @@ class ShareController extends AuthPublicShareController { $hideFileList = false; if ($shareNode instanceof \OCP\Files\Folder) { - $shareIsFolder = true; try { @@ -553,7 +552,7 @@ class ShareController extends AuthPublicShareController { $share = $this->shareManager->getShareByToken($token); - if(!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) { + if (!($share->getPermissions() & \OCP\Constants::PERMISSION_READ)) { return new \OCP\AppFramework\Http\DataResponse('Share is read-only'); } @@ -676,7 +675,6 @@ class ShareController extends AuthPublicShareController { $subNode = $node->get($file); $this->singleFileDownloaded($share, $subNode); } - } /** @@ -738,7 +736,6 @@ class ShareController extends AuthPublicShareController { $affectedUser, $fileId, $filePath) { - $event = $this->activityManager->generateEvent(); $event->setApp('files_sharing') ->setType('public_links') @@ -747,6 +744,4 @@ class ShareController extends AuthPublicShareController { ->setObject('files', $fileId, $filePath); $this->activityManager->publish($event); } - - } diff --git a/apps/files_sharing/lib/Controller/ShareInfoController.php b/apps/files_sharing/lib/Controller/ShareInfoController.php index 31f98f91c03..315a562abef 100644 --- a/apps/files_sharing/lib/Controller/ShareInfoController.php +++ b/apps/files_sharing/lib/Controller/ShareInfoController.php @@ -88,7 +88,6 @@ class ShareInfoController extends ApiController { try { $node = $node->get($dir); } catch (NotFoundException $e) { - } } diff --git a/apps/files_sharing/lib/Controller/ShareesAPIController.php b/apps/files_sharing/lib/Controller/ShareesAPIController.php index a8cd2196629..557a92d0fca 100644 --- a/apps/files_sharing/lib/Controller/ShareesAPIController.php +++ b/apps/files_sharing/lib/Controller/ShareesAPIController.php @@ -212,7 +212,7 @@ class ShareesAPIController extends OCSController { list($result, $hasMoreResults) = $this->collaboratorSearch->search($search, $shareTypes, $lookup, $this->limit, $this->offset); // extra treatment for 'exact' subarray, with a single merge expected keys might be lost - if(isset($result['exact'])) { + if (isset($result['exact'])) { $result['exact'] = array_merge($this->result['exact'], $result['exact']); } $this->result = array_merge($this->result, $result); |