switch remaining settings to dotenv format

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 753159d235690f6974a0d23e0502f1b0c792036a..9f266aeb615933572783a59f6b802d32cb5af8ab 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -18,9 +18,35 @@ function loadSettings($sProjectDir)
     $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 
     $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 

-function getSetting($sConfName)
+function getSetting($sConfName, $sDefault = null)

 {
 {

-    return $_ENV['NOMINATIM_'.$sConfName];
+    $sValue = $_ENV['NOMINATIM_'.$sConfName];
+
+    if ($sDefault !== null && !$sValue) {
+        return $sDefault;
+    }
+
+    return $sValue;
+}
+
+function getSettingBool($sConfName)
+{
+    $sVal = strtolower(getSetting($sConfName));
+
+    return strcmp($sVal, 'yes') == 0
+           || strcmp($sVal, 'true') == 0
+           || strcmp($sVal, '1') == 0;
+}
+
+function getSettingConfig($sConfName, $sSystemConfig)
+{
+    $sValue = $_ENV['NOMINATIM_'.$sConfName];
+
+    if (!$sValue) {
+        return CONST_DataDir.'/settings/'.$sSystemConfig;
+    }
+
+    return $sValue;

 }
 
 function fail($sError, $sUserError = false)
 }
 
 function fail($sError, $sUserError = false)