diff options
author | Julius Härtl <jus@bitgrid.net> | 2020-12-03 11:54:11 +0300 |
---|---|---|
committer | GitHub <noreply@github.com> | 2020-12-03 11:54:11 +0300 |
commit | 523210eb6624cbfd770e7b4223a887a7335b085a (patch) | |
tree | c2196f050d1922927c71b81091da07776e1afd4f | |
parent | bea59761960f0e54d68a1d58fd8b55844c7b0b84 (diff) | |
parent | 4c31101171ed91a30d9e0fc46233ce7c2ec735ff (diff) |
Merge pull request #1278 from nextcloud/bugfix/noid/empty-remote
-rw-r--r-- | lib/Capabilities.php | 1 | ||||
-rw-r--r-- | lib/Controller/DocumentController.php | 2 | ||||
-rw-r--r-- | lib/Db/WopiMapper.php | 2 | ||||
-rw-r--r-- | lib/Service/FederationService.php | 2 |
4 files changed, 5 insertions, 2 deletions
diff --git a/lib/Capabilities.php b/lib/Capabilities.php index e8ad527a..3cd1b8c5 100644 --- a/lib/Capabilities.php +++ b/lib/Capabilities.php @@ -91,6 +91,7 @@ class Capabilities implements ICapability { $collaboraCapabilities = $this->capabilitiesService->getCapabilities(); $this->capabilities = [ 'richdocuments' => [ + 'version' => \OC::$server->getAppManager()->getAppVersion('richdocuments'), 'mimetypes' => self::MIMETYPES, 'mimetypesNoDefaultOpen' => self::MIMETYPES_OPTIONAL, 'collabora' => $collaboraCapabilities, diff --git a/lib/Controller/DocumentController.php b/lib/Controller/DocumentController.php index 3f2071db..f9100bce 100644 --- a/lib/Controller/DocumentController.php +++ b/lib/Controller/DocumentController.php @@ -202,7 +202,7 @@ class DocumentController extends Controller { '&richdocuments_remote_access=' . $remote; $event = new BeforeFederationRedirectEvent( - $item, $relative, $remote + $item, $relativeFolderPath, $remote ); $eventDispatcher = \OC::$server->getEventDispatcher(); $eventDispatcher->dispatch(BeforeFederationRedirectEvent::class, $event); diff --git a/lib/Db/WopiMapper.php b/lib/Db/WopiMapper.php index d2cd3842..dbd2f67d 100644 --- a/lib/Db/WopiMapper.php +++ b/lib/Db/WopiMapper.php @@ -82,6 +82,8 @@ class WopiMapper extends Mapper { 'direct' => $direct, 'isRemoteToken' => $isRemoteToken, 'templateId' => $templateId, + 'remoteServer' => '', + 'remoteServerToken' => '', 'share' => $share ]); diff --git a/lib/Service/FederationService.php b/lib/Service/FederationService.php index 1d18fdef..2a06ce5a 100644 --- a/lib/Service/FederationService.php +++ b/lib/Service/FederationService.php @@ -196,7 +196,7 @@ class FederationService { } else { $wopi = $this->tokenManager->getRemoteTokenFromDirect($item, $direct->getUid()); } - $url = $remote . 'index.php/apps/richdocuments/remote?shareToken=' . $item->getStorage()->getToken() . + $url = rtrim($remote, '') . '/index.php/apps/richdocuments/remote?shareToken=' . $item->getStorage()->getToken() . '&remoteServer=' . $wopi->getServerHost() . '&remoteServerToken=' . $wopi->getToken(); if ($item->getInternalPath() !== '') { |