LoggingConfigForm.php (icingaweb2-2.11.3) | : | LoggingConfigForm.php (icingaweb2-2.11.4) | ||
---|---|---|---|---|
skipping to change at line 33 | skipping to change at line 33 | |||
$this->setName('form_config_general_logging'); | $this->setName('form_config_general_logging'); | |||
} | } | |||
/** | /** | |||
* {@inheritdoc} | * {@inheritdoc} | |||
* | * | |||
* @return $this | * @return $this | |||
*/ | */ | |||
public function createElements(array $formData) | public function createElements(array $formData) | |||
{ | { | |||
$defaultType = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE') ? 'php' : 'sysl | ||||
og'; | ||||
$this->addElement( | $this->addElement( | |||
'select', | 'select', | |||
'logging_log', | 'logging_log', | |||
array( | array( | |||
'required' => true, | 'required' => true, | |||
'autosubmit' => true, | 'autosubmit' => true, | |||
'label' => $this->translate('Logging Type'), | 'label' => $this->translate('Logging Type'), | |||
'description' => $this->translate('The type of logging to util ize.'), | 'description' => $this->translate('The type of logging to util ize.'), | |||
'value' => $defaultType, | ||||
'multiOptions' => array( | 'multiOptions' => array( | |||
'syslog' => 'Syslog', | 'syslog' => 'Syslog', | |||
'php' => $this->translate('Webserver Log', 'app.config .logging.type'), | 'php' => $this->translate('Webserver Log', 'app.config .logging.type'), | |||
'file' => $this->translate('File', 'app.config.logging. type'), | 'file' => $this->translate('File', 'app.config.logging. type'), | |||
'none' => $this->translate('None', 'app.config.logging. type') | 'none' => $this->translate('None', 'app.config.logging. type') | |||
) | ) | |||
) | ) | |||
); | ); | |||
if (! isset($formData['logging_log']) || $formData['logging_log'] !== 'n one') { | if (! isset($formData['logging_log']) || $formData['logging_log'] !== 'n one') { | |||
skipping to change at line 97 | skipping to change at line 100 | |||
'regexNotMatch' => $this->translate( | 'regexNotMatch' => $this->translate( | |||
'The application prefix must not contain whitespace.' | 'The application prefix must not contain whitespace.' | |||
) | ) | |||
) | ) | |||
) | ) | |||
) | ) | |||
) | ) | |||
) | ) | |||
); | ); | |||
if (! isset($formData['logging_log']) || $formData['logging_log'] == = 'syslog') { | if ((isset($formData['logging_log']) ? $formData['logging_log'] : $d efaultType) === 'syslog') { | |||
if (Platform::isWindows()) { | if (Platform::isWindows()) { | |||
/* @see https://secure.php.net/manual/en/function.openlog.ph p */ | /* @see https://secure.php.net/manual/en/function.openlog.ph p */ | |||
$this->addElement( | $this->addElement( | |||
'hidden', | 'hidden', | |||
'logging_facility', | 'logging_facility', | |||
array( | array( | |||
'value' => 'user', | 'value' => 'user', | |||
'disabled' => true | 'disabled' => true | |||
) | ) | |||
); | ); | |||
End of changes. 3 change blocks. | ||||
1 lines changed or deleted | 5 lines changed or added |