From 24e6c08471a1a027e61665b6087533a1b49c9adb Mon Sep 17 00:00:00 2001 From: Nicolas Boisselier Date: Fri, 12 Jan 2018 02:59:39 +0000 Subject: [PATCH] www/dbq/dbq.php --- lib/php/nb.php | 12 ++++++++++-- 1 file changed, 10 insertions(+), 2 deletions(-) diff --git a/lib/php/nb.php b/lib/php/nb.php index 730624c8..8263ed44 100644 --- 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'].',' : ''; -- 2.47.3