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 1/3] 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 72168b3c31..274d4bd23c 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 b72d3a9dd9..1fcdf2fe50 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); From 92a6530c0f8bf50e94a0b5d23e3f334ac76a2941 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 2/3] Properly emit Viewer event on files and files_sharing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/lib/Controller/ViewController.php | 5 +++++ apps/files_sharing/lib/Controller/ShareController.php | 6 ++++++ apps/files_sharing/list.php | 6 ++++++ 3 files changed, 17 insertions(+) diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 688db41f8b..015f34941d 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -39,6 +39,7 @@ namespace OCA\Files\Controller; use OCA\Files\Activity\Helper; use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Event\LoadSidebar; +use OCA\Viewer\Event\LoadViewer; use OCP\App\IAppManager; use OCP\AppFramework\Controller; use OCP\AppFramework\Http\ContentSecurityPolicy; @@ -281,6 +282,10 @@ class ViewController extends Controller { $this->eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, $event); $this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar()); + // Load Viewer scripts + if (class_exists(LoadViewer::class)) { + $this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer()); + } $params = []; $params['usedSpacePercent'] = (int) $storageInfo['relative']; diff --git a/apps/files_sharing/lib/Controller/ShareController.php b/apps/files_sharing/lib/Controller/ShareController.php index 274d4bd23c..3feb98f7f0 100644 --- a/apps/files_sharing/lib/Controller/ShareController.php +++ b/apps/files_sharing/lib/Controller/ShareController.php @@ -46,6 +46,7 @@ use OC_Util; use OC\Security\CSP\ContentSecurityPolicy; use OCA\FederatedFileSharing\FederatedShareProvider; use OCA\Files_Sharing\Activity\Providers\Downloads; +use OCA\Viewer\Event\LoadViewer; use OCP\AppFramework\AuthPublicShareController; use OCP\AppFramework\Http\NotFoundResponse; use OCP\AppFramework\Http\Template\ExternalShareMenuAction; @@ -453,6 +454,11 @@ class ShareController extends AuthPublicShareController { \OCP\Util::addScript('files', 'filelist'); \OCP\Util::addScript('files', 'keyboardshortcuts'); \OCP\Util::addScript('files', 'operationprogressbar'); + + // Load Viewer scripts + if (class_exists(LoadViewer::class)) { + $this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer()); + } } // OpenGraph Support: http://ogp.me/ diff --git a/apps/files_sharing/list.php b/apps/files_sharing/list.php index 8197224af5..370ca53c6b 100644 --- a/apps/files_sharing/list.php +++ b/apps/files_sharing/list.php @@ -23,6 +23,7 @@ */ use OCA\Files\Event\LoadAdditionalScriptsEvent; use OCA\Files\Event\LoadSidebar; +use OCA\Viewer\Event\LoadViewer; use OCP\EventDispatcher\GenericEvent; // Check if we are a user @@ -44,4 +45,9 @@ $eventDispatcher->dispatch('\OCP\Collaboration\Resources::loadAdditionalScripts' $eventDispatcher->dispatch(LoadAdditionalScriptsEvent::class, new LoadAdditionalScriptsEvent()); $eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar()); +// Load Viewer scripts +if (class_exists(LoadViewer::class)) { + $eventDispatcher->dispatch(LoadViewer::class, new LoadViewer()); +} + $tmpl->printPage(); From 3cdadeb9e9c75b4e68a8c3c0d4825b0fae2a7854 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?John=20Molakvo=C3=A6=20=28skjnldsv=29?= Date: Fri, 6 Mar 2020 15:44:42 +0100 Subject: [PATCH 3/3] Use dispatchTyped MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: John Molakvoæ (skjnldsv) --- apps/files/lib/Controller/ViewController.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/files/lib/Controller/ViewController.php b/apps/files/lib/Controller/ViewController.php index 015f34941d..70b878f43a 100644 --- a/apps/files/lib/Controller/ViewController.php +++ b/apps/files/lib/Controller/ViewController.php @@ -284,7 +284,7 @@ class ViewController extends Controller { $this->eventDispatcher->dispatch(LoadSidebar::class, new LoadSidebar()); // Load Viewer scripts if (class_exists(LoadViewer::class)) { - $this->eventDispatcher->dispatch(LoadViewer::class, new LoadViewer()); + $this->eventDispatcher->dispatchTyped(new LoadViewer()); } $params = [];