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

doc module: Respond with 404 if a chapter was not found or the doc directory is empty 

refs #4820
This commit is contained in:
Eric Lippmann 2014-06-30 15:48:43 +02:00
parent 1bbfa9b9ca
commit 2ea418cbe6
1 changed files with 12 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
modules/doc/application/controllers/ModuleController.php
View File

@ -2,9 +2,10 @@
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
use Zend_Controller_Action_Exception;
use \Zend_Controller_Action_Exception;
use Icinga\Application\Icinga;
use Icinga\Module\Doc\DocController;
use Icinga\Module\Doc\Exception\DocException;
class Doc_ModuleController extends DocController
{
@ -53,7 +54,11 @@ class Doc_ModuleController extends DocController
$moduleName = $this->getParam('moduleName');
$this->assertModuleEnabled($moduleName);
$moduleManager = Icinga::app()->getModuleManager();
$this->populateToc($moduleManager->getModuleDir($moduleName, '/doc'), $moduleName);
try {
$this->populateToc($moduleManager->getModuleDir($moduleName, '/doc'), $moduleName);
} catch (DocException $e) {
throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
}
$this->view->moduleName = $moduleName;
}
@ -71,7 +76,11 @@ class Doc_ModuleController extends DocController
throw new Zend_Controller_Action_Exception('Missing parameter "chapterName"', 404);
}
$moduleManager = Icinga::app()->getModuleManager();
$this->populateChapter($chapterName, $moduleManager->getModuleDir($moduleName, '/doc'));
try {
$this->populateChapter($chapterName, $moduleManager->getModuleDir($moduleName, '/doc'));
} catch (DocException $e) {
throw new Zend_Controller_Action_Exception($e->getMessage(), 404);
}
$this->view->moduleName = $moduleName;
}
}