diff --git a/application/forms/Config/General/ApplicationConfigForm.php b/application/forms/Config/General/ApplicationConfigForm.php index 63a32fa9b..fa1e3b82e 100644 --- a/application/forms/Config/General/ApplicationConfigForm.php +++ b/application/forms/Config/General/ApplicationConfigForm.php @@ -70,57 +70,25 @@ class ApplicationConfigForm extends Form ) ); - // we do not need this form for setup because we set the database there as default. - // this form is only displayed in configuration -> application if preferences backend type of ini is recognized - if (isset($formData['global_config_backend']) && $formData['global_config_backend'] === 'ini') { - $this->addElement( - 'select', - 'global_config_backend', - [ - 'required' => true, - 'autosubmit' => true, - 'label' => $this->translate('User Preference Storage Type'), - 'multiOptions' => [ - 'ini' => $this->translate('File System (INI Files)'), - 'db' => $this->translate('Database') - ] - ] - ); - } else { - $this->addElement( - 'hidden', - 'global_config_backend', - [ - 'required' => true, - 'value' => 'db', - 'disabled' => true - ] - ); + $backends = array(); + foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) { + $backends[$name] = $name; } - if (! isset($formData['global_config_backend']) || $formData['global_config_backend'] === 'db') { - $backends = array(); - foreach (ResourceFactory::getResourceConfigs()->toArray() as $name => $resource) { - if ($resource['type'] === 'db') { - $backends[$name] = $name; - } - } - - $this->addElement( - 'select', - 'global_config_resource', - array( - 'required' => true, - 'multiOptions' => array_merge( - ['' => sprintf(' - %s - ', $this->translate('Please choose'))], - $backends - ), - 'disable' => [''], - 'value' => '', - 'label' => $this->translate('Configuration Database') - ) - ); - } + $this->addElement( + 'select', + 'global_config_resource', + array( + 'required' => true, + 'multiOptions' => array_merge( + ['' => sprintf(' - %s - ', $this->translate('Please choose'))], + $backends + ), + 'disable' => [''], + 'value' => '', + 'label' => $this->translate('Configuration Database') + ) + ); return $this; }