X-Git-Url: https://git.openstreetmap.org./nominatim.git/blobdiff_plain/3e871d6ee0212f20fc3f528b3957616b72bddad2..15a1666f8a1e19c338015fccd502be6cfd5c24df:/lib/init-cmd.php?ds=sidebyside

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index e5a650fc..b7645cd5 100644
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,31 +1,5 @@
 <?php
-	if (file_exists(getenv('NOMINATIM_SETTINGS')))
-	{
-		require_once(getenv('NOMINATIM_SETTINGS'));
-	}
 
-	require_once('init.php');
-	require_once('cmd.php');
-
-	// handle http proxy when using file_get_contents
-	if (CONST_HTTP_Proxy) {
-	  $proxy = 'tcp://' . CONST_HTTP_Proxy_Host . ':' . CONST_HTTP_Proxy_Port;
-	  $aHeaders = array();
-	  if(CONST_HTTP_Proxy_Login != null && CONST_HTTP_Proxy_Login != '' && CONST_HTTP_Proxy_Password != null && CONST_HTTP_Proxy_Password != '') {
-	    $auth = base64_encode(CONST_HTTP_Proxy_Login . ':' . CONST_HTTP_Proxy_Password);
-	    $aHeaders = array("Proxy-Authorization: Basic $auth");
-	  }
-	  $aContext = array(
-	    'http' => array(
-	      'proxy' => $proxy,
-	      'request_fulluri' => true,
-	      'header' => $aHeaders
-	    ),
-	    'https' => array(
-	      'proxy' => $proxy,
-	      'request_fulluri' => true,
-	      'header' => $aHeaders
-	    )
-	  );
-	  stream_context_set_default($aContext);
-	}
+require_once('init.php');
+require_once('cmd.php');
+require_once('DebugNone.php');