From d43f30903c5be80ee9cebc0f45fb661eb4d8b8db Mon Sep 17 00:00:00 2001
From: Sarah Hoffmann <lonvia@denofr.de>
Date: Tue, 15 Dec 2020 15:36:13 +0100
Subject: [PATCH] use explicit DSN for website scripts

Website scripts have no access to the dotenv variables, so use
the DSN constant instead when connecting to the database.
---
 website/deletable.php | 2 +-
 website/details.php   | 2 +-
 website/lookup.php    | 2 +-
 website/polygons.php  | 2 +-
 website/reverse.php   | 2 +-
 website/search.php    | 2 +-
 website/status.php    | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/website/deletable.php b/website/deletable.php
index 9a0ea0d8..81fb4f99 100644
--- a/website/deletable.php
+++ b/website/deletable.php
@@ -9,7 +9,7 @@ $oParams = new Nominatim\ParameterParser();
 $sOutputFormat = $oParams->getSet('format', array('json'), 'json');
 set_exception_handler_by_format($sOutputFormat);
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $sSQL = 'select placex.place_id, country_code,';
diff --git a/website/details.php b/website/details.php
index 2f91b2bb..91440b54 100644
--- a/website/details.php
+++ b/website/details.php
@@ -25,7 +25,7 @@ $bIncludeHierarchy = $oParams->getBool('hierarchy', false);
 $bGroupHierarchy = $oParams->getBool('group_hierarchy', false);
 $bIncludePolygonAsGeoJSON = $oParams->getBool('polygon_geojson', false);
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $sLanguagePrefArraySQL = $oDB->getArraySQL($oDB->getDBQuotedList($aLangPrefOrder));
diff --git a/website/lookup.php b/website/lookup.php
index e4a98939..737edc62 100644
--- a/website/lookup.php
+++ b/website/lookup.php
@@ -15,7 +15,7 @@ set_exception_handler_by_format($sOutputFormat);
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $hLog = logStart($oDB, 'place', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
diff --git a/website/polygons.php b/website/polygons.php
index 418bec09..88b48ae8 100644
--- a/website/polygons.php
+++ b/website/polygons.php
@@ -13,7 +13,7 @@ $iDays = $oParams->getInt('days', false);
 $bReduced = $oParams->getBool('reduced', false);
 $sClass = $oParams->getString('class', false);
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $iTotalBroken = (int) $oDB->getOne('SELECT count(*) FROM import_polygon_error');
diff --git a/website/reverse.php b/website/reverse.php
index 556808c1..553c2692 100644
--- a/website/reverse.php
+++ b/website/reverse.php
@@ -16,7 +16,7 @@ set_exception_handler_by_format($sOutputFormat);
 // Preferred language
 $aLangPrefOrder = $oParams->getPreferredLanguages();
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 
 $hLog = logStart($oDB, 'reverse', $_SERVER['QUERY_STRING'], $aLangPrefOrder);
diff --git a/website/search.php b/website/search.php
index 05d0e444..48646843 100644
--- a/website/search.php
+++ b/website/search.php
@@ -6,7 +6,7 @@ require_once(CONST_LibDir.'/Geocode.php');
 require_once(CONST_LibDir.'/output.php');
 ini_set('memory_limit', '200M');
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 $oDB->connect();
 $oParams = new Nominatim\ParameterParser();
 
diff --git a/website/status.php b/website/status.php
index dc497ff5..9f030fb3 100644
--- a/website/status.php
+++ b/website/status.php
@@ -7,7 +7,7 @@ require_once(CONST_LibDir.'/Status.php');
 $oParams = new Nominatim\ParameterParser();
 $sOutputFormat = $oParams->getSet('format', array('text', 'json'), 'text');
 
-$oDB = new Nominatim\DB();
+$oDB = new Nominatim\DB(CONST_Database_DSN);
 
 if ($sOutputFormat == 'json') {
     header('content-type: application/json; charset=UTF-8');
-- 
2.39.5