From ee021d184c4efd5b153541e57dcae54ab48e13bb Mon Sep 17 00:00:00 2001
From: Nicolas Boisselier <nicolas.boisselier@gmail.com>
Date: Wed, 28 Feb 2018 01:22:44 +0000
Subject: [PATCH] etc/dbq/ldap.php

---
 etc/dbq/ldap.php          | 2 +-
 lib/php/db/types/ldap.php | 7 +++++--
 2 files changed, 6 insertions(+), 3 deletions(-)

diff --git a/etc/dbq/ldap.php b/etc/dbq/ldap.php
index 6cace2ad..32f5fdee 100644
--- 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 44bd1ba5..c059165e 100644
--- 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) {
-- 
2.47.3