introduce dotenv parsing for setup.php

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index c4fbca308636e60e0cd0e59a27fc63eb517b7597..9861cdd03f69f496b63ca038fadd5d84e89055ad 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,5 +1,23 @@
 <?php
 
+require('Symfony/Component/Dotenv/autoload.php');
+
+function loadSettings($sProjectDir)
+{
+    if (!$sProjectDir) {
+        $sProjectDir = getcwd();
+    }
+
+    @define('CONST_InstallDir', $sProjectDir);
+
+    $dotenv = new \Symfony\Component\Dotenv\Dotenv();
+
+    if (file_exists($sProjectDir.'/.env')) {
+        $dotenv->load($sProjectDir.'/.env');
+    }
+    $dotenv->load(CONST_DataDir.'/settings/env.defaults');
+}
+
 function fail($sError, $sUserError = false)
 {
     if (!$sUserError) $sUserError = $sError;
@@ -55,7 +73,7 @@ function byImportance($a, $b)
     if ($a['importance'] != $b['importance'])
         return ($a['importance'] > $b['importance']?-1:1);
 
-    return ($a['foundorder'] < $b['foundorder']?-1:1);
+    return $a['foundorder'] <=> $b['foundorder'];
 }