Welcome to mirror list, hosted at ThFree Co, Russian Federation.

github.com/nextcloud/richdocuments.git - Unnamed repository; edit this file 'description' to name the repository.
summaryrefslogtreecommitdiff
path: root/lib
diff options
context:
space:
mode:
authorJulius Härtl <jus@bitgrid.net>2019-08-29 10:44:42 +0300
committerJulius Härtl <jus@bitgrid.net>2019-08-29 10:44:42 +0300
commita21b33b1013b122efcec619da4a41f885d8a4ac1 (patch)
treef646ab2ddd6a1581f91006b35137f302a9c54a51 /lib
parent595fe720f90c42e1a34cf81076f85f394d2ecdc4 (diff)
Cleanup public wopi URL since otherwise it doesn't work in the CSP headers
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Diffstat (limited to 'lib')
-rw-r--r--lib/Controller/SettingsController.php3
1 files changed, 1 insertions, 2 deletions
diff --git a/lib/Controller/SettingsController.php b/lib/Controller/SettingsController.php
index 5050d548..c198cdb5 100644
--- a/lib/Controller/SettingsController.php
+++ b/lib/Controller/SettingsController.php
@@ -158,8 +158,7 @@ class SettingsController extends Controller{
try {
$capaUrlSrc = $this->wopiParser->getUrlSrc('Capabilities');
if (is_array($capaUrlSrc) && $capaUrlSrc['action'] === 'getinfo') {
- // XXX Works, but probably better to strip trailing '/hosting/capabilities'
- $public_wopi_url = $capaUrlSrc['urlsrc'];
+ $public_wopi_url = str_replace('/hosting/capabilities', '', $capaUrlSrc['urlsrc']);
if ($public_wopi_url !== null) {
$this->appConfig->setAppValue('public_wopi_url', $public_wopi_url);
$colon = strpos($public_wopi_url, ':', 0);