etc/dbq/ldap.php

diff --git a/etc/dbq/ldap.php b/etc/dbq/ldap.php
index 6cace2ada881caa2539c668d8ec81dd3d4df4d6e..32f5fdeec9b98177d1119b71f2c1a85cf9657fd2 100644 (file)
--- a/etc/dbq/ldap.php
+++ b/etc/dbq/ldap.php
@@ -74,7 +74,7 @@ $DBQ['ldap'] = $GLOBALS['DBQ_LDAP'] + [
                                '!dn',
                                'cn',
                                'dn',
-                               #'uid',
+                               'sn',
                                'displayName',
                                'givenName',
                                #'audio',

diff --git a/lib/php/db/types/ldap.php b/lib/php/db/types/ldap.php
index 44bd1ba5422aa3496be2a6b5454bb5c0d23f9900..c059165ed780678cc6fc578232d02ea00f6feee7 100644 (file)
--- a/lib/php/db/types/ldap.php
+++ b/lib/php/db/types/ldap.php
@@ -37,6 +37,7 @@ $DB_TYPES['ldap'] = [
                return $row;
        },
        'html_edit_multi' => function($field) {
+               #if (isset($GLOBALS['html_edit_add'])) return false;
                $r = !in_array($field->name,[
                                'dn',
                                'cn',
@@ -87,9 +88,11 @@ $DB_TYPES['ldap'] = [
        'insert' => function(&$table,&$values) {
                $dn = $values['dn']; unset($values['dn']);
                foreach ($values as $k=>$v) {
-                       if ($v === '') unset($values[$k]);
+                       if ($v === '' or (
+                               is_array($v) and count($v) == 1 and $v[0] === ''
+                       )) unset($values[$k]);
                }
-               bye([$dn,$values]);
+               #bye([$dn,$values]);
                return (int)$table->db()->ldap->add($dn,$values);
        },
        'delete' => function(&$table,&$values) {