Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index b4c415d9d228d9db553fe678a3b0c34ca7838b4f..7760f695304748fe80d9a549c5d76fedbdf5066a 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,17 +1,13 @@
 <?php
 
 <?php
 

-require('Symfony/Component/Dotenv/autoload.php');
-

 function loadSettings($sProjectDir)
 {
     @define('CONST_InstallDir', $sProjectDir);
 function loadSettings($sProjectDir)
 {
     @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');
-    }
+    // Temporary hack to set the direcory via environment instead of
+    // the installed scripts. Neither setting is part of the official
+    // set of settings.
+    defined('CONST_DataDir') or define('CONST_DataDir', $_SERVER['NOMINATIM_DATADIR']);
+    defined('CONST_BinDir') or define('CONST_BinDir', $_SERVER['NOMINATIM_BINDIR']);

 }
 
 function getSetting($sConfName, $sDefault = null)
 }
 
 function getSetting($sConfName, $sDefault = null)


@@ -36,7 +32,7 @@ function getSettingBool($sConfName)
 
 function getSettingConfig($sConfName, $sSystemConfig)
 {
 
 function getSettingConfig($sConfName, $sSystemConfig)
 {

-    $sValue = $_ENV['NOMINATIM_'.$sConfName];
+    $sValue = $_SERVER['NOMINATIM_'.$sConfName];

 
     if (!$sValue) {
         return CONST_DataDir.'/settings/'.$sSystemConfig;
 
     if (!$sValue) {
         return CONST_DataDir.'/settings/'.$sSystemConfig;