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

Revert "Make preferences INI path NOT be configurable" 

This reverts commit 219869607d.
This commit is contained in:
Alexander Klimov 2014-06-25 11:05:23 +02:00
parent fac3c9f3a6
commit fdf74c5e18
2 changed files with 19 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
application/forms/Config/GeneralForm.php
View File

@ -212,6 +212,16 @@ class GeneralForm extends Form
)
);
$txtPreferencesIniPath = new Zend_Form_Element_Text(
array(
'name' => 'preferences_ini_path',
'label' => 'User Preference Filepath',
'required' => $backend === 'ini',
'condition' => $backend === 'ini',
'value' => $cfg->get('config_path')
)
);
$backends = array();
foreach ($this->getResources() as $name => $resource) {
if ($resource['type'] !== 'db') {
@ -232,8 +242,11 @@ class GeneralForm extends Form
);
$validator = new WritablePathValidator();
$validator->setRequireExistence();
$txtPreferencesIniPath->addValidator($validator);
$this->addElement($txtPreferencesIniPath);
$this->addElement($txtPreferencesDbResource);
$txtPreferencesIniPath->addDecorator(new ConditionalHidden());
$txtPreferencesDbResource->addDecorator(new ConditionalHidden());
$this->enableAutoSubmit(
array(
@ -288,7 +301,9 @@ class GeneralForm extends Form
$cfg->global->timezone = $values['timezone'];
$cfg->global->modulePath = $values['module_path'];
$cfg->preferences->type = $values['preferences_type'];
if ($cfg->preferences->type === 'db') {
if ($cfg->preferences->type === 'ini') {
$cfg->preferences->config_path = $values['preferences_ini_path'];
} elseif ($cfg->preferences->type === 'db') {
$cfg->preferences->resource = $values['preferences_db_resource'];
}

4
library/Icinga/Application/ApplicationBootstrap.php
View File

@ -152,7 +152,9 @@ abstract class ApplicationBootstrap
}
}
$canonical = realpath($configDir);
$this->configDir = $canonical ? $canonical : $configDir;
if ($canonical) {
$this->configDir = $canonical;
}
$this->setupAutoloader();
$this->setupZendAutoloader();