From fff795c6ab138dab114efabd6c2316ff275d984e Mon Sep 17 00:00:00 2001 From: "Alexander A. Klimov" Date: Mon, 23 Jan 2023 15:13:46 +0100 Subject: [PATCH] LoggingConfigForm: on Docker default to webserver log (cherry picked from commit 3784fe80b77f52cf20b1e49c324cfa6ecb8fec33) --- application/forms/Config/General/LoggingConfigForm.php | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/application/forms/Config/General/LoggingConfigForm.php b/application/forms/Config/General/LoggingConfigForm.php index 3b518adae..bbc772314 100644 --- a/application/forms/Config/General/LoggingConfigForm.php +++ b/application/forms/Config/General/LoggingConfigForm.php @@ -30,6 +30,8 @@ class LoggingConfigForm extends Form */ public function createElements(array $formData) { + $defaultType = getenv('ICINGAWEB_OFFICIAL_DOCKER_IMAGE') ? 'php' : 'syslog'; + $this->addElement( 'select', 'logging_log', @@ -38,6 +40,7 @@ class LoggingConfigForm extends Form 'autosubmit' => true, 'label' => $this->translate('Logging Type'), 'description' => $this->translate('The type of logging to utilize.'), + 'value' => $defaultType, 'multiOptions' => array( 'syslog' => 'Syslog', 'php' => $this->translate('Webserver Log', 'app.config.logging.type'), @@ -94,7 +97,7 @@ class LoggingConfigForm extends Form ) ); - if (! isset($formData['logging_log']) || $formData['logging_log'] === 'syslog') { + if ((isset($formData['logging_log']) ? $formData['logging_log'] : $defaultType) === 'syslog') { if (Platform::isWindows()) { /* @see https://secure.php.net/manual/en/function.openlog.php */ $this->addElement(