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 d8521ed76991421c51a83a3f4504b300d38091dc..50c709c9ad16d1c89dfc359a1f083abfb3623dfa 100644 (file)
--- a/lib/init-cmd.php
+++ b/lib/init-cmd.php
@@ -2,26 +2,27 @@
 
 require_once('init.php');
 require_once('cmd.php');
+require_once('DebugNone.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 != '') {
+    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
-        )
-    );
+                 'http' => array(
+                            'proxy' => $proxy,
+                            'request_fulluri' => true,
+                            'header' => $aHeaders
+                           ),
+                 'https' => array(
+                             'proxy' => $proxy,
+                             'request_fulluri' => true,
+                             'header' => $aHeaders
+                            )
+                );
     stream_context_set_default($aContext);
 }