Merge pull request #2115 from lonvia/use-dotenv

[nominatim.git] / website / status.php

diff --git a/website/status.php b/website/status.php
index c0c379d0a983e6dd6d331d5a0089a75866570952..9f030fb3ea38314047b50973bc6929aa80117de3 100644 (file)
--- a/website/status.php
+++ b/website/status.php
@@ -1,18 +1,13 @@
 <?php
 
 <?php
 

-@define('CONST_ConnectionBucket_PageType', 'Status');
-
-require_once(dirname(dirname(__FILE__)).'/settings/settings.php');
-require_once(CONST_BasePath.'/lib/init-website.php');
-require_once(CONST_BasePath.'/lib/ParameterParser.php');
-require_once(CONST_BasePath.'/lib/Status.php');
+require_once(CONST_LibDir.'/init-website.php');
+require_once(CONST_LibDir.'/ParameterParser.php');
+require_once(CONST_LibDir.'/Status.php');

 
 $oParams = new Nominatim\ParameterParser();
 $sOutputFormat = $oParams->getSet('format', array('text', 'json'), 'text');
 
 
 $oParams = new Nominatim\ParameterParser();
 $sOutputFormat = $oParams->getSet('format', array('text', 'json'), 'text');
 

-$oDB = DB::connect(CONST_Database_DSN, false);
-$oStatus = new Nominatim\Status($oDB);
-
+$oDB = new Nominatim\DB(CONST_Database_DSN);

 
 if ($sOutputFormat == 'json') {
     header('content-type: application/json; charset=UTF-8');
 
 if ($sOutputFormat == 'json') {
     header('content-type: application/json; charset=UTF-8');


@@ -20,6 +15,7 @@ if ($sOutputFormat == 'json') {
 
 
 try {
 
 
 try {

+    $oStatus = new Nominatim\Status($oDB);

     $oStatus->status();
 } catch (Exception $oErr) {
     if ($sOutputFormat == 'json') {
     $oStatus->status();
 } catch (Exception $oErr) {
     if ($sOutputFormat == 'json') {