From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 24 Jan 2018 03:48:53 +0000 (+0000)
Subject: www/dbq/dbq.php
X-Git-Url: https://git.nbdom.net/?a=commitdiff_plain;h=aa9371fd0010f2f2f5fdf8a63d7a35df9aed5b12;p=nb.git

www/dbq/dbq.php
---

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index f8b883a0..3b2598fc 100644
--- a/www/dbq/dbq.php
+++ b/www/dbq/dbq.php
@@ -185,11 +185,16 @@ class DbQ extends nb {
 			'filter' => $filter,
 			'attrs' => $attrs,
 		];
-		if (false and !empty($GLOBALS['DBQ_LDAP'])) {
+		if (true and !empty($GLOBALS['DBQ_LDAP'])) {
 			#debug($GLOBALS['DBQ_LDAP']);
 			$ldap = new Ldap($GLOBALS['DBQ_LDAP']);
 			if (!$search['filter']) {
-				$search['filter'] = 'cn='.Http::user();
+				if (preg_match('/^([^,]+),(.*?)$/',$GLOBALS['DBQ_LDAP']['user'],$m)) {
+					$search['filter'] = $m[1];
+					$search['base'] = $m[2];
+				} else {
+					$search['filter'] = 'cn='.Http::user();
+				}
 			}
 			$rows = $ldap->_search($GLOBALS['DBQ_LDAP'] + $search);
 		} else {