remove old default settings

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 9861cdd03f69f496b63ca038fadd5d84e89055ad..aeba499b43a62ba13bc688334388bea75735dc76 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -4,10 +4,6 @@ require('Symfony/Component/Dotenv/autoload.php');
 
 function loadSettings($sProjectDir)
 {
 
 function loadSettings($sProjectDir)
 {

-    if (!$sProjectDir) {
-        $sProjectDir = getcwd();
-    }
-

     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();
     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();


@@ -18,6 +14,37 @@ function loadSettings($sProjectDir)
     $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 
     $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 

+function getSetting($sConfName, $sDefault = null)
+{
+    $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)
 {
     if (!$sUserError) $sUserError = $sError;
 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;