kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-04-30 01:55:47 +00:00
Code Issues Projects Releases Wiki Activity

Merge pull request #360 from mduret/master

Browse Source 
Parse settings provided via environment variables as boolean if needed
This commit is contained in:
Bernd Bestel 2019-09-17 19:15:50 +02:00 committed by GitHub
commit 3fd0f44fe4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
helpers/extensions.php
View File

@ -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 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 else
{ {
@ -173,7 +184,7 @@ function DefaultUserSetting(string $name, $value)
function GetUserDisplayName($user) function GetUserDisplayName($user)
{ {
$displayName = ''; $displayName = '';
if (empty($user->first_name) && !empty($user->last_name)) if (empty($user->first_name) && !empty($user->last_name))
{ {
$displayName = $user->last_name; $displayName = $user->last_name;