kenmirrors/grocy
1
0
Fork 0
mirror of https://github.com/grocy/grocy.git synced 2025-08-19 03:40:10 +00:00
Code Issues Projects Releases Wiki Activity

Process Settings from environment and settingoverrides values the same: (#660)

Browse Source 
* fixes handling strings representing bools from settingoverrides .txt files
  * trailing newline characters are now stripped
This commit is contained in:
dacto
2020-03-25 11:30:16 -07:00
committed by GitHub
parent 22eaeee572
commit 573b6ece89
1 changed files with 16 additions and 13 deletions
Download Patch File Download Diff File Expand all files Collapse all files

29
helpers/extensions.php
View File

@@ -138,6 +138,20 @@ function BoolToString(bool $bool)
return $bool ? 'true' : 'false'; return $bool ? 'true' : 'false';
} }
function ExternalSettingValue(string $value)
{
$tvalue = rtrim($value, "\r\n");
$lvalue = strtolower($tvalue);
if ($lvalue === "true"){
return true;
}
elseif ($lvalue === "false")
{
return false;
}
return $tvalue;
}
function Setting(string $name, $value) function Setting(string $name, $value)
{ {
if (!defined('GROCY_' . $name)) if (!defined('GROCY_' . $name))
@@ -146,22 +160,11 @@ function Setting(string $name, $value)
$settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt'; $settingOverrideFile = GROCY_DATAPATH . '/settingoverrides/' . $name . '.txt';
if (file_exists($settingOverrideFile)) if (file_exists($settingOverrideFile))
{ {
define('GROCY_' . $name, file_get_contents($settingOverrideFile)); define('GROCY_' . $name, ExternalSettingValue(file_get_contents($settingOverrideFile)));
} }
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
{ {
if (strtolower(getenv('GROCY_' . $name)) === "true") define('GROCY_' . $name, ExternalSettingValue(getenv('GROCY_'. $name)));
{
define('GROCY_' . $name, true);
}
elseif (strtolower(getenv('GROCY_' . $name)) === "false")
{
define('GROCY_' . $name, false);
}
else
{
define('GROCY_' . $name, getenv('GROCY_' . $name));
}
} }
else else
{ {