Add new config item public_wopi_url.

It will be used in addAllowedFrameDomain() and automatically
determined from the Capabilities URL in the discovery response.

Signed-off-by: Rainer Jung <rainer.jung@kippdata.de>

1 files changed, 5 insertions, 5 deletions

diff --git a/appinfo/app.php b/appinfo/app.php
index 338ff5b1..54f3d5b3 100644
--- a/appinfo/app.php
+++ b/appinfo/app.php
@@ -62,14 +62,14 @@ if (class_exists('\OC\Files\Type\TemplateManager')) {
 
 }
 
-// Whitelist the wopi URL for iframes, required for Firefox
-$wopiUrl = \OC::$server->getConfig()->getAppValue('richdocuments', 'wopi_url');
-if ($wopiUrl !== '') {
+// Whitelist the public wopi URL for iframes, required for Firefox
+$publicWopiUrl = \OC::$server->getConfig()->getAppValue('richdocuments', 'public_wopi_url');
+if ($publicWopiUrl !== '') {
 	$manager = \OC::$server->getContentSecurityPolicyManager();
 	$policy = new ContentSecurityPolicy();
-	$policy->addAllowedFrameDomain($wopiUrl);
+	$policy->addAllowedFrameDomain($publicWopiUrl);
 	if (method_exists($policy, 'addAllowedFormActionDomain')) {
-		$policy->addAllowedFormActionDomain($wopiUrl);
+		$policy->addAllowedFormActionDomain($publicWopiUrl);
 	}
 	$manager->addDefaultPolicy($policy);
 }