www/dbq/dbq.php

diff --git a/lib/php/nb.php b/lib/php/nb.php
index 730624c82d22b7fea8190bfb7cb93f1c7cf44909..8263ed44f5e8ff20db9a330cc03671b73a91a1b9 100644 (file)
--- a/lib/php/nb.php
+++ b/lib/php/nb.php
@@ -1058,6 +1058,14 @@ class NB {
                return $code;
        }
 
+       public static function http_pass() {
+               foreach ([
+                       'PHP_AUTH_PW',
+               ] as $k) {
+                       if (!empty($_SERVER[$k])) return $_SERVER[$k];
+               }
+       }
+
        public static function http_user() {
                foreach ([
                        'PHP_AUTH_USER',
@@ -1083,9 +1091,9 @@ class NB {
                if (!isset($o['host'])) $o['host'] = $host;
                if (!isset($o['base_dn'])) $o['base_dn'] = 'dc=' . str_replace('.',',dc=',preg_replace('/^ldap[^.]*./','',$host));
 
-               if (!isset($o['user'])) $o['user'] = $_SERVER['PHP_AUTH_USER'];
+               if (!isset($o['user'])) $o['user'] = self::http_user();
 
-               if (!isset($o['password'])) $o['password'] = $_SERVER['PHP_AUTH_PW'];
+               if (!isset($o['password'])) $o['password'] = self::http_pass();
 
                $o['bind_dn_preff'] = isset($o['bind_dn_preff']) ? ','.$o['bind_dn_preff'].',' : '';