tyler.durden
/
icingaweb2
mirror of https://github.com/Icinga/icingaweb2.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Improve Action Controller postDispatch readability

This commit is contained in:
Thomas Gelf 2014-03-17 17:11:08 +01:00
parent e0c93d6ca7
commit 757570cdc2
1 changed files with 16 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
library/Icinga/Web/Controller/ActionController.php
View File

@ -287,35 +287,43 @@ class ActionController extends Zend_Controller_Action
{ {
Benchmark::measure('Action::postDispatch()'); Benchmark::measure('Action::postDispatch()');
$this->addModuleContainer(); $layout = $this->_helper->layout();
// $this->addModuleContainer();
$isXhr = $this->_request->isXmlHttpRequest();
$layout->moduleName = $this->_request->getModuleName();
if ($layout->moduleName === 'default') {
$layout->moduleName = false;
} elseif ($isXhr) {
header('X-Icinga-Module: ' . $layout->moduleName);
}
if ($user = $this->getRequest()->getUser()) { if ($user = $this->getRequest()->getUser()) {
// Cast preference app.showBenchmark to bool because preferences loaded from a preferences storage are // Cast preference app.showBenchmark to bool because preferences loaded from a preferences storage are
// always strings // always strings
if ((bool) $user->getPreferences()->get('app.showBenchmark', false) === true) { if ((bool) $user->getPreferences()->get('app.showBenchmark', false) === true) {
Benchmark::measure('Response ready'); Benchmark::measure('Response ready');
$this->_helper->layout()->benchmark = $this->renderBenchmark(); $layout->benchmark = $this->renderBenchmark();
} }
} }
if ($this->_request->getParam('format') === 'pdf') { if ($this->_request->getParam('format') === 'pdf') {
$this->_helper->layout()->setLayout('pdf'); $layout->setLayout('pdf');
$this->sendAsPdf(); $this->sendAsPdf();
exit; exit;
} }
if ($this->_request->isXmlHttpRequest() || $this->getParam('view') === 'compact') { if ($isXhr || $this->getParam('view') === 'compact') {
$this->_helper->layout()->setLayout('inline'); $layout->setLayout('inline');
} }
$notifications = Notification::getInstance(); $notifications = Notification::getInstance();
if ($this->_request->isXmlHttpRequest() && $notifications->hasMessages()) { if ($isXhr && $notifications->hasMessages()) {
foreach ($notifications->getMessages() as $m) { foreach ($notifications->getMessages() as $m) {
header('X-Icinga-Notification: ' . $m->type . ' ' . $m->message); header('X-Icinga-Notification: ' . $m->type . ' ' . $m->message);
} }
} }
if ($this->_request->isXmlHttpRequest() && $this->noXhrBody) { if ($isXhr && $this->noXhrBody) {
header('X-Icinga-Container: ignore'); header('X-Icinga-Container: ignore');
return; return;
} }
@ -329,7 +337,7 @@ class ActionController extends Zend_Controller_Action
} }
// TODO: _render=layout? // TODO: _render=layout?
if ($this->getParam('_render') === 'layout') { if ($this->getParam('_render') === 'layout') {
$this->_helper->layout()->setLayout('body'); $layout->setLayout('body');
header('X-Icinga-Container: layout'); header('X-Icinga-Container: layout');
} }
if ($this->autorefreshInterval !== null) { if ($this->autorefreshInterval !== null) {