From 219869607dab6b9fe9d7eec5a9ae82af5dfa23e9 Mon Sep 17 00:00:00 2001 From: Alexander Klimov Date: Tue, 24 Jun 2014 18:29:28 +0200 Subject: [PATCH] Make preferences INI path NOT be configurable fixes #6567 --- application/forms/Config/GeneralForm.php | 17 +---------------- .../Icinga/Application/ApplicationBootstrap.php | 4 +--- 2 files changed, 2 insertions(+), 19 deletions(-) diff --git a/application/forms/Config/GeneralForm.php b/application/forms/Config/GeneralForm.php index 45f15d2a6..26b9f32d3 100644 --- a/application/forms/Config/GeneralForm.php +++ b/application/forms/Config/GeneralForm.php @@ -291,16 +291,6 @@ 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') { @@ -321,11 +311,8 @@ 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( @@ -385,9 +372,7 @@ class GeneralForm extends Form $cfg->preferences->type = $values['preferences_type']; - if ($cfg->preferences->type === 'ini') { - $cfg->preferences->config_path = $values['preferences_ini_path']; - } elseif ($cfg->preferences->type === 'db') { + if ($cfg->preferences->type === 'db') { $cfg->preferences->resource = $values['preferences_db_resource']; } diff --git a/library/Icinga/Application/ApplicationBootstrap.php b/library/Icinga/Application/ApplicationBootstrap.php index 89597be3d..bb530ce29 100644 --- a/library/Icinga/Application/ApplicationBootstrap.php +++ b/library/Icinga/Application/ApplicationBootstrap.php @@ -152,9 +152,7 @@ abstract class ApplicationBootstrap } } $canonical = realpath($configDir); - if ($canonical) { - $this->configDir = $canonical; - } + $this->configDir = $canonical ? $canonical : $configDir; $this->setupAutoloader(); $this->setupZendAutoloader();