From b5b2f9c5b974f2a7dd5091610df961652dac10e4 Mon Sep 17 00:00:00 2001 From: Mathieu Duret Date: Tue, 17 Sep 2019 16:45:11 +0200 Subject: [PATCH] Parse settings provided via environment variables as boolean if needed (https://github.com/grocy/grocy/issues/346) --- helpers/extensions.php | 15 +++++++++++++-- 1 file changed, 13 insertions(+), 2 deletions(-) diff --git a/helpers/extensions.php b/helpers/extensions.php index e92b85a4..b254db30 100644 --- a/helpers/extensions.php +++ b/helpers/extensions.php @@ -150,7 +150,18 @@ function Setting(string $name, $value) } elseif (getenv('GROCY_' . $name) !== false) // An environment variable with the same name and prefix GROCY_ overwrites the given setting { - define('GROCY_' . $name, getenv('GROCY_' . $name)); + if (strtolower(getenv('GROCY_' . $name)) === "true") + { + define('GROCY_' . $name, true); + } + elseif (strtolower(getenv('GROCY_' . $name)) === "false") + { + define('GROCY_' . $name, false); + } + else + { + define('GROCY_' . $name, getenv('GROCY_' . $name)); + } } else { @@ -173,7 +184,7 @@ function DefaultUserSetting(string $name, $value) function GetUserDisplayName($user) { $displayName = ''; - + if (empty($user->first_name) && !empty($user->last_name)) { $displayName = $user->last_name;