move creation of website scripts to setup script

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 9f266aeb615933572783a59f6b802d32cb5af8ab..b4c415d9d228d9db553fe678a3b0c34ca7838b4f 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -4,23 +4,19 @@ require('Symfony/Component/Dotenv/autoload.php');
 
 function loadSettings($sProjectDir)
 {
-    if (!$sProjectDir) {
-        $sProjectDir = getcwd();
-    }
-
     @define('CONST_InstallDir', $sProjectDir);
 
     $dotenv = new \Symfony\Component\Dotenv\Dotenv();
+    $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 
     if (file_exists($sProjectDir.'/.env')) {
         $dotenv->load($sProjectDir.'/.env');
     }
-    $dotenv->load(CONST_DataDir.'/settings/env.defaults');
 }
 
 function getSetting($sConfName, $sDefault = null)
 {
-    $sValue = $_ENV['NOMINATIM_'.$sConfName];
+    $sValue = $_SERVER['NOMINATIM_'.$sConfName];
 
     if ($sDefault !== null && !$sValue) {
         return $sDefault;
@@ -138,6 +134,24 @@ function addQuotes($s)
     return "'".$s."'";
 }
 
+function fwriteConstDef($rFile, $sConstName, $value)
+{
+    $sEscapedValue;
+
+    if (is_bool($value)) {
+        $sEscapedValue = $value ? 'true' : 'false';
+    } elseif (is_numeric($value)) {
+        $sEscapedValue = strval($value);
+    } elseif (!$value) {
+        $sEscapedValue = 'false';
+    } else {
+        $sEscapedValue = addQuotes(str_replace("'", "\\'", (string)$value));
+    }
+
+    fwrite($rFile, "@define('CONST_$sConstName', $sEscapedValue);\n");
+}
+
+
 function parseLatLon($sQuery)
 {
     $sFound    = null;