- Allow to configure the number of values allowed for each LDAP attribute

- Support for serialized LDAP address values (usually delimited with a $)

Conflicts:

	config/main.inc.php.dist

1 files changed, 6 insertions, 4 deletions

diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 3f6b040c2..2ee78c29d 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -580,16 +580,16 @@ $rcmail_config['ldap_public']['Verisign'] = array(
   // the object classes (can include additional fields not required by the object classes).
   'required_fields' => array('cn', 'sn', 'mail'),
   'search_fields'   => array('mail', 'cn'),  // fields to search in
-  // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
-  'sub_fields' => array(),
   // mapping of contact fields to directory attributes
+  //   for every attribute one can specify the number of values (limit) allowed.
+  //   default is 1, a wildcard * means unlimited
   'fieldmap' => array(
-    // Roundcube  => LDAP
+    // Roundcube  => LDAP:limit
     'name'        => 'cn',
     'surname'     => 'sn',
     'firstname'   => 'givenName',
     'title'       => 'title',
-    'email'       => 'mail',
+    'email'       => 'mail:*',
     'phone:home'  => 'homePhone',
     'phone:work'  => 'telephoneNumber',
     'phone:mobile' => 'mobile',
@@ -609,6 +609,8 @@ $rcmail_config['ldap_public']['Verisign'] = array(
 //    'manager'      => 'manager',
 //    'assistant'    => 'secretary',
   ),
+  // Map of contact sub-objects (attribute name => objectClass(es)), e.g. 'c' => 'country'
+  'sub_fields' => array(),
   'sort'          => 'cn',    // The field to sort the listing by.
   'scope'         => 'sub',   // search mode: sub|base|list
   'filter'        => '(objectClass=inetOrgPerson)',      // used for basic listing (if not empty) and will be &'d with search queries. example: status=act