Remove configuration option for setting the access mode on new files

This commit is contained in:
Johannes Meyer 2014-11-12 09:40:07 +01:00
parent 4992140326
commit c3e28a42fb
4 changed files with 0 additions and 32 deletions

View File

@ -8,8 +8,6 @@ use DateTimeZone;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Util\Translator; use Icinga\Util\Translator;
use Icinga\Data\ResourceFactory; use Icinga\Data\ResourceFactory;
use Icinga\Web\Form\Element\Number;
use Icinga\File\Ini\IniWriter;
/** /**
* Form class to modify the general application configuration * Form class to modify the general application configuration
@ -67,20 +65,6 @@ class ApplicationConfigForm extends Form
) )
); );
$this->addElement(
new Number(
'global_filemode',
array(
'required' => true,
'label' => t('Default File Mode'),
'description' => t(
'This is the global default file mode for new configuration files created by Icinga Web 2.'
),
'value' => decoct(IniWriter::$fileMode)
)
)
);
$this->addElement( $this->addElement(
'text', 'text',
'global_modulePath', 'global_modulePath',

View File

@ -381,12 +381,6 @@ abstract class ApplicationBootstrap
$this->config = new Config(); $this->config = new Config();
} }
if ($this->config->global !== null) {
IniWriter::$fileMode = octdec($this->config->global->get('filemode', '0664'));
} else {
IniWriter::$fileMode = 0664;
}
return $this; return $this;
} }

View File

@ -7,7 +7,6 @@ namespace Icinga\Module\Setup\Form;
use Icinga\Web\Form; use Icinga\Web\Form;
use Icinga\Web\Form\Element\Note; use Icinga\Web\Form\Element\Note;
use Icinga\Form\Config\General\LoggingConfigForm; use Icinga\Form\Config\General\LoggingConfigForm;
use Icinga\Form\Config\General\ApplicationConfigForm;
/** /**
* Wizard page to define the application and logging configuration * Wizard page to define the application and logging configuration
@ -51,11 +50,6 @@ class GeneralConfigPage extends Form
) )
); );
// TODO: This is splitted as not all elements are required (as of d201cff)
$appForm = new ApplicationConfigForm();
$appForm->createElements($formData);
$this->addElement($appForm->getElement('global_filemode'));
$loggingForm = new LoggingConfigForm(); $loggingForm = new LoggingConfigForm();
$this->addElements($loggingForm->createElements($formData)->getElements()); $this->addElements($loggingForm->createElements($formData)->getElements());
} }

View File

@ -57,10 +57,6 @@ class GeneralConfigStep extends Step
$generalHtml = '' $generalHtml = ''
. '<ul>' . '<ul>'
. '<li>' . sprintf(
mt('setup', 'Icinga Web 2 will save new configuration files using the mode "%s".'),
$this->data['generalConfig']['global_filemode']
) . '</li>'
. '<li>' . sprintf( . '<li>' . sprintf(
$this->data['preferencesType'] === 'ini' ? sprintf( $this->data['preferencesType'] === 'ini' ? sprintf(
t('Preferences will be stored per user account in INI files at: %s'), t('Preferences will be stored per user account in INI files at: %s'),