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

Show the user a senseful error message in case enabledModules is missing 

fixes #7205
This commit is contained in:
Johannes Meyer 2014-11-18 16:22:33 +01:00
parent ff3b988324
commit f007663235
2 changed files with 15 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
library/Icinga/Application/Modules/Manager.php
View File

@ -13,6 +13,7 @@ use Icinga\Exception\ConfigurationError;
use Icinga\Exception\SystemPermissionException;
use Icinga\Exception\ProgrammingError;
use Icinga\Exception\NotReadableError;
use Icinga\Exception\NotFoundError;
/**
* Module manager that handles detecting, enabling and disabling of modules
@ -228,6 +229,7 @@ class Manager
*
* @return self
* @throws ConfigurationError When trying to enable a module that is not installed
* @throws NotFoundError In case the "enabledModules" directory does not exist
* @throws SystemPermissionException When insufficient permissions for the application exist
*/
public function enableModule($name)
@ -245,9 +247,11 @@ class Manager
$target = $this->installedBaseDirs[$name];
$link = $this->enableDir . '/' . $name;
if (!is_writable($this->enableDir)) {
if (! is_dir($this->enableDir)) {
throw new NotFoundError('Cannot enable module "%s". Path "%s" not found.', $name, $this->enableDir);
} elseif (!is_writable($this->enableDir)) {
throw new SystemPermissionException(
'Can not enable module "%s". Insufficient system permissions for enabling modules.',
'Cannot enable module "%s". Insufficient system permissions for enabling modules.',
$name
);
}

9
library/Icinga/Exception/NotFoundError.php Normal file
View File

@ -0,0 +1,9 @@
<?php
// {{{ICINGA_LICENSE_HEADER}}}
// {{{ICINGA_LICENSE_HEADER}}}
namespace Icinga\Exception;
class NotFoundError extends IcingaException
{
}