From 6c968fe77db0ef96e16b103f47e318531f3d33be Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Wed, 4 Mar 2020 13:51:40 +0100 Subject: [PATCH] Fix import order and formatting MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files_sharing/lib/Controller/ShareController.php | 3 ++- apps/files_sharing/public.php | 2 +- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 72168b3c316..274d4bd23c0 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -41,9 +41,9 @@ namespace OCA\Files_Sharing\Controller; -use OC\Security\CSP\ContentSecurityPolicy; use OC_Files; use OC_Util; +use OC\Security\CSP\ContentSecurityPolicy; use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Files_Sharing\Activity\Providers\Downloads; use OCP\AppFramework\AuthPublicShareController; @@ -370,6 +370,7 @@ class ShareController extends AuthPublicShareController { $maxUploadFilesize = $freeSpace; $folder = new Template('files', 'list', ''); + $folder->assign('dir', $shareNode->getRelativePath($folderNode->getPath())); $folder->assign('dirToken', $this->getToken()); $folder->assign('permissions', \OCP\Constants::PERMISSION_READ); diff --git a/apps/files_sharing/public.php b/apps/files_sharing/public.php index b72d3a9dd9a..1fcdf2fe505 100644 --- a/apps/files_sharing/public.php +++ b/apps/files_sharing/public.php @@ -27,7 +27,7 @@ $urlGenerator = \OC::$server->getURLGenerator(); $token = isset($_GET['t']) ? $_GET['t'] : ''; $route = isset($_GET['download']) ? 'files_sharing.sharecontroller.downloadShare' : 'files_sharing.sharecontroller.showShare'; -if($token !== '') { +if ($token !== '') { $protocol = \OC::$server->getRequest()->getHttpProtocol(); if ($protocol == 'HTTP/1.0') { http_response_code(302);