rooty/OwncloudBookmarksOfficial
1
0
Fork 0
mirror of https://github.com/owncloud/bookmarks.git synced 2025-01-22 18:52:10 +01:00
Code Issues Releases Activity

Merge pull request #182 from owncloud/allow-iframes

Browse Source 
Allow iframes
This commit is contained in:
blizzz 2015-08-03 11:40:21 +02:00
commit 5b69efb7fb
1 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
controller/webviewcontroller.php
View File

@ -12,6 +12,7 @@
namespace OCA\Bookmarks\Controller; namespace OCA\Bookmarks\Controller;
use OCP\AppFramework\Http\ContentSecurityPolicy;
use \OCP\IRequest; use \OCP\IRequest;
use \OCP\AppFramework\Http\TemplateResponse; use \OCP\AppFramework\Http\TemplateResponse;
use \OCP\AppFramework\Controller; use \OCP\AppFramework\Controller;
@ -38,7 +39,13 @@ class WebViewController extends Controller {
public function index() { public function index() {
$bookmarkleturl = $this->urlgenerator->getAbsoluteURL('index.php/apps/bookmarks/bookmarklet'); $bookmarkleturl = $this->urlgenerator->getAbsoluteURL('index.php/apps/bookmarks/bookmarklet');
$params = array('user' => $this->userId, 'bookmarkleturl' => $bookmarkleturl); $params = array('user' => $this->userId, 'bookmarkleturl' => $bookmarkleturl);
return new TemplateResponse('bookmarks', 'main', $params);
$policy = new ContentSecurityPolicy();
$policy->addAllowedFrameDomain("'self'");
$response = new TemplateResponse('bookmarks', 'main', $params);
$response->setContentSecurityPolicy($policy);
return $response;
} }
/** /**