From 9846dfb2e2576181f7f18c74fe85eebeeec6573d Mon Sep 17 00:00:00 2001 From: Eric Lippmann <eric.lippmann@netways.de> Date: Tue, 28 Jul 2015 13:47:06 +0200 Subject: [PATCH] doc: Use Controller:httpNotFound() in ModuleController refs #9644 --- .../application/controllers/ModuleController.php | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) diff --git a/modules/doc/application/controllers/ModuleController.php b/modules/doc/application/controllers/ModuleController.php index 9b8d1d1cf..0608e0ad6 100644 --- a/modules/doc/application/controllers/ModuleController.php +++ b/modules/doc/application/controllers/ModuleController.php @@ -35,10 +35,7 @@ class Doc_ModuleController extends DocController if ($suppressErrors) { return null; } - throw new Zend_Controller_Action_Exception( - sprintf($this->translate('Documentation for module \'%s\' is not available'), $module), - 404 - ); + $this->httpNotFound($this->translate('Documentation for module \'%s\' is not available'), $module); } /** @@ -75,10 +72,7 @@ class Doc_ModuleController extends DocController } $moduleManager = Icinga::app()->getModuleManager(); if (! $moduleManager->hasInstalled($moduleName)) { - throw new Zend_Controller_Action_Exception( - sprintf($this->translate('Module \'%s\' is not installed'), $moduleName), - 404 - ); + $this->httpNotFound($this->translate('Module \'%s\' is not installed'), $moduleName); } } @@ -100,7 +94,7 @@ class Doc_ModuleController extends DocController array('moduleName' => $module) ); } catch (DocException $e) { - throw new Zend_Controller_Action_Exception($e->getMessage(), 404); + $this->httpNotFound($e->getMessage()); } } @@ -131,7 +125,7 @@ class Doc_ModuleController extends DocController array('moduleName' => $module) ); } catch (DocException $e) { - throw new Zend_Controller_Action_Exception($e->getMessage(), 404); + $this->httpNotFound($e->getMessage()); } }