Merge remote-tracking branch 'upstream/master'

[nominatim.git] / lib / init-cmd.php

diff --git a/lib/init-cmd.php b/lib/init-cmd.php
index e5a650fc1a49ebb9e01aa73dcbf187b26f7a90d1..860ef2158264b5a9c910af85388079111eac5ec1 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -1,31 +1,27 @@
 <?php
 <?php

-       if (file_exists(getenv('NOMINATIM_SETTINGS')))
-       {
-               require_once(getenv('NOMINATIM_SETTINGS'));
-       }

 
 

-       require_once('init.php');
-       require_once('cmd.php');
+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);
-       }
+// 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);
+}