www/dbq/dbq.php

diff --git a/www/dbq/dbq.php b/www/dbq/dbq.php
index f8b883a0d8ba34658044a9082c19634d8f1e48e1..3b2598fcb9565b6d5f41b3dad0af3fe60850050a 100644 (file)
--- 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 {