update osm2pgsql (disable install rule)

[nominatim.git] / lib / lib.php

diff --git a/lib/lib.php b/lib/lib.php
index 74abe6a28cc03cb778463cb96d789d8267a99870..a02fefd055fa121097a38e55b07fbb069bed2d3c 100644 (file)
--- a/lib/lib.php
+++ b/lib/lib.php
@@ -1,17 +1,14 @@
 <?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']);
+    defined('CONST_Default_ModulePath') or define('CONST_Default_ModulePath', $_SERVER['NOMINATIM_DATABASE_MODULE_SRC_PATH']);

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


@@ -36,7 +33,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;


@@ -134,6 +131,24 @@ function addQuotes($s)
     return "'".$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;
 function parseLatLon($sQuery)
 {
     $sFound    = null;