diff options
author | Phie <phie@phie.ovh> | 2019-08-17 18:31:58 +0300 |
---|---|---|
committer | Phie <phie@phie.ovh> | 2019-08-17 18:31:58 +0300 |
commit | 256774c2de59b5190ed49637776636fe44522da9 (patch) | |
tree | 614b96fd4e1f2b772b83df5ed4edaf6ce393d42b | |
parent | 5e4a3a27430ab49517b365e120ca7bc2253eb2de (diff) |
real template + cache for writer
-rwxr-xr-x | appinfo/routes.php | 2 | ||||
-rwxr-xr-x | lib/Controller/PageController.php | 13 | ||||
-rwxr-xr-x | templates/writer.php | 4 |
3 files changed, 17 insertions, 2 deletions
diff --git a/appinfo/routes.php b/appinfo/routes.php index 2d9c35b..9fe50a5 100755 --- a/appinfo/routes.php +++ b/appinfo/routes.php @@ -8,11 +8,11 @@ * it's instantiated in there */ -$this->create('carnet_writer','/writer')->actionInclude('carnet/templates/writer.php'); return [ 'routes' => [ ['name' => 'page#index', 'url' => '/', 'verb' => 'GET'], + ['name' => 'page#writer', 'url' => '/writer', 'verb' => 'GET'], ['name' => 'page#settings', 'url' => '/settings', 'verb' => 'GET'], ['name' => 'note#getNotePath', 'url' => '/settings/note_path', 'verb' => 'GET'], ['name' => 'note#setNotePath', 'url' => '/settings/note_path', 'verb' => 'POST'], diff --git a/lib/Controller/PageController.php b/lib/Controller/PageController.php index d4402c0..9c96699 100755 --- a/lib/Controller/PageController.php +++ b/lib/Controller/PageController.php @@ -36,10 +36,21 @@ class PageController extends Controller { $response->renderAs("blank"); $policy = new ContentSecurityPolicy(); $policy->addAllowedFrameDomain('\'self\''); - $response->setContentSecurityPolicy($policy); // allow iframe + $response->setContentSecurityPolicy($policy); // allow iframe + $response->cacheFor(604800); return $response; } + /** + * @NoAdminRequired + * @NoCSRFRequired + */ + public function writer() { + $response = new TemplateResponse($this->appName,"writer"); + $response->renderAs("blank"); + $response->cacheFor(604800); + return $response; + } /** * @NoAdminRequired * @NoCSRFRequired diff --git a/templates/writer.php b/templates/writer.php index 56eec7a..18a22d1 100755 --- a/templates/writer.php +++ b/templates/writer.php @@ -30,6 +30,10 @@ $file = str_replace("<!ROOTPATH>", $root."/CarnetElectron/", $file); $root = substr(__DIR__, strlen($_SERVER['DOCUMENT_ROOT'])); $urlGenerator = \OC::$server->getURLGenerator(); $file = str_replace("<!ROOTURL>", $root."/CarnetElectron/", $file); +if (method_exists(\OC::$server, "getContentSecurityPolicyNonceManager")){ + $nonce = \OC::$server->getContentSecurityPolicyNonceManager()->getNonce(); + $file = str_replace("src=\"","defer nonce='".$nonce."' src=\"",$file); +} $file = str_replace("<!APIURL>", parse_url($urlGenerator->linkToRouteAbsolute("carnet.page.index"), PHP_URL_PATH), $file); echo $file; |