diff options
Diffstat (limited to 'vendor/ipl/web/src/Compat')
| -rw-r--r-- | vendor/ipl/web/src/Compat/StyleWithNonce.php | 8 | ||||
| -rw-r--r-- | vendor/ipl/web/src/Compat/ViewRenderer.php | 12 |
2 files changed, 14 insertions, 6 deletions
diff --git a/vendor/ipl/web/src/Compat/StyleWithNonce.php b/vendor/ipl/web/src/Compat/StyleWithNonce.php index f4c7185..8c1be31 100644 --- a/vendor/ipl/web/src/Compat/StyleWithNonce.php +++ b/vendor/ipl/web/src/Compat/StyleWithNonce.php @@ -2,6 +2,7 @@ namespace ipl\Web\Compat; +use Icinga\Application\Icinga; use Icinga\Application\Version; use Icinga\Util\Csp; use ipl\Web\Style; @@ -15,9 +16,10 @@ class StyleWithNonce extends Style public function getNonce(): ?string { if ($this->nonce === null) { - $this->nonce = version_compare(Version::VERSION, '2.12.0', '>=') - ? Csp::getStyleNonce() ?? '' - : ''; + $this->nonce = ''; + if (version_compare(Version::VERSION, '2.12.0', '>=') && Icinga::app()->isWeb()) { + $this->nonce = Csp::getStyleNonce() ?? ''; + } } return parent::getNonce(); diff --git a/vendor/ipl/web/src/Compat/ViewRenderer.php b/vendor/ipl/web/src/Compat/ViewRenderer.php index 48ddcc3..0eaa8dd 100644 --- a/vendor/ipl/web/src/Compat/ViewRenderer.php +++ b/vendor/ipl/web/src/Compat/ViewRenderer.php @@ -2,11 +2,16 @@ namespace ipl\Web\Compat; +use Icinga\Web\View; +use ipl\Html\HtmlDocument; use Zend_Controller_Action_Helper_ViewRenderer as Zf1ViewRenderer; use Zend_Controller_Action_HelperBroker as Zf1HelperBroker; class ViewRenderer extends Zf1ViewRenderer { + /** @var View */ + public $view; + /** * Inject the view renderer */ @@ -41,9 +46,10 @@ class ViewRenderer extends Zf1ViewRenderer */ public function render($action = null, $name = null, $noController = null) { - $view = $this->view; + /** @var HtmlDocument $document */ + $document = $this->view->document; - if ($view->document->isEmpty() || $this->getRequest()->getParam('error_handler') !== null) { + if ($document->isEmpty() || $this->getRequest()->getParam('error_handler') !== null) { parent::render($action, $name, $noController); return; @@ -53,7 +59,7 @@ class ViewRenderer extends Zf1ViewRenderer $name = $this->getResponseSegment(); } - $this->getResponse()->appendBody($view->document->render(), $name); + $this->getResponse()->appendBody($document->render(), $name); $this->setNoRender(); } |