From a605b2584df2dd5bc2bd3b9ba73e71d921eb9a13 Mon Sep 17 00:00:00 2001
From: thomascube <thomas@roundcube.net>
Date: Wed, 02 May 2012 16:56:29 -0400
Subject: [PATCH] - Allow to configure the number of values allowed for each LDAP attribute - Support for serialized LDAP address values (usually delimited with a $)
---
program/include/rcube_ldap.php | 64 +++++++++++++++++++++----------
config/main.inc.php.dist | 29 ++++++++------
2 files changed, 59 insertions(+), 34 deletions(-)
diff --git a/config/main.inc.php.dist b/config/main.inc.php.dist
index 14cdfd6..f5f42d7 100644
--- a/config/main.inc.php.dist
+++ b/config/main.inc.php.dist
@@ -580,16 +580,16 @@
// 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',
@@ -598,17 +598,20 @@
'zipcode' => 'postalCode',
'region' => 'st',
'locality' => 'l',
-// if you uncomment country, you need to modify 'sub_fields' above
-// 'country' => 'c',
+ // if you country is a complex object, you need to configure 'sub_fields' below
+ 'country' => 'c',
'organization' => 'o',
- 'department' => 'departmentNumber',
- 'notes' => 'description',
-// these currently don't work:
-// 'phone:workfax' => 'facsimileTelephoneNumber',
-// 'photo' => 'jpegPhoto',
-// 'manager' => 'manager',
-// 'assistant' => 'secretary',
+ 'department' => 'ou',
+ 'jobtitle' => 'title',
+ 'notes' => 'description',
+ // these currently don't work:
+ // 'phone:workfax' => 'facsimileTelephoneNumber',
+ // 'photo' => 'jpegPhoto',
+ // '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
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php
index 88b7cd0..d3067e1 100644
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@@ -102,23 +102,39 @@
}
// use fieldmap to advertise supported coltypes to the application
- foreach ($this->fieldmap as $col => $lf) {
- list($col, $type) = explode(':', $col);
+ foreach ($this->fieldmap as $colv => $lfv) {
+ list($col, $type) = explode(':', $colv);
+ list($lf, $limit, $delim) = explode(':', $lfv);
+
+ if ($limit == '*') $limit = null;
+ else $limit = max(1, intval($limit));
+
if (!is_array($this->coltypes[$col])) {
$subtypes = $type ? array($type) : null;
- $this->coltypes[$col] = array('limit' => 1, 'subtypes' => $subtypes);
+ $this->coltypes[$col] = array('limit' => $limit, 'subtypes' => $subtypes);
}
elseif ($type) {
$this->coltypes[$col]['subtypes'][] = $type;
- $this->coltypes[$col]['limit']++;
+ $this->coltypes[$col]['limit'] += $limit;
}
+
+ if ($delim)
+ $this->coltypes[$col]['serialized'][$type] = $delim;
+
if ($type && !$this->fieldmap[$col])
- $this->fieldmap[$col] = $lf;
+ $this->fieldmap[$col] = $lf;
+
+ $this->fieldmap[$colv] = $lf;
}
// support for composite address
if ($this->fieldmap['street'] && $this->fieldmap['locality']) {
- $this->coltypes['address'] = array('limit' => max(1, $this->coltypes['locality']['limit']), 'subtypes' => $this->coltypes['locality']['subtypes'], 'childs' => array());
+ $this->coltypes['address'] = array(
+ 'limit' => max(1, $this->coltypes['locality']['limit'] + $this->coltypes['address']['limit']),
+ 'subtypes' => array_merge((array)$this->coltypes['address']['subtypes'], $this->coltypes['locality']['subtypes']),
+ 'childs' => array(),
+ ) + (array)$this->coltypes['address'];
+
foreach (array('street','locality','zipcode','region','country') as $childcol) {
if ($this->fieldmap[$childcol]) {
$this->coltypes['address']['childs'][$childcol] = array('type' => 'text');
@@ -1181,18 +1197,9 @@
} // end if
} // end if
} // end foreach
-/*
- console($old_data);
- console($ldap_data);
- console('----');
- console($newdata);
- console($replacedata);
- console($deletedata);
- console('----');
- console($subdata);
- console($subnewdata);
- console($subdeldata);
-*/
+
+ // console($old_data, $ldap_data, '----', $newdata, $replacedata, $deletedata, '----', $subdata, $subnewdata, $subdeldata);
+
$dn = self::dn_decode($id);
// Update the entry as required.
@@ -1480,6 +1487,8 @@
$out[$rf][] = sprintf('%s@%s', $value, $this->mail_domain);
else if (in_array($col, array('street','zipcode','locality','country','region')))
$out['address'.($subtype?':':'').$subtype][$i][$col] = $value;
+ else if ($col == 'address' && strpos($value, '$') !== false) // address data is represented as string separated with $
+ list($out[$rf][$i]['street'], $out[$rf][$i]['locality'], $out[$rf][$i]['zipcode'], $out[$rf][$i]['country']) = explode('$', $value);
else if ($rec[$lf]['count'] > 1)
$out[$rf][] = $value;
else
@@ -1522,6 +1531,15 @@
}
}
}
+
+ // if addresses are to be saved as serialized string, do so
+ if (is_array($colprop['serialized'])) {
+ foreach ($colprop['serialized'] as $subtype => $delim) {
+ $key = $col.':'.$subtype;
+ foreach ((array)$save_cols[$key] as $i => $val)
+ $save_cols[$key][$i] = join($delim, array($val['street'], $val['locality'], $val['zipcode'], $val['country']));
+ }
+ }
}
$ldap_data = array();
@@ -1542,17 +1560,21 @@
/**
* Returns unified attribute name (resolving aliases)
*/
- private static function _attr_name($name)
+ private static function _attr_name($namev)
{
// list of known attribute aliases
- $aliases = array(
+ static $aliases = array(
'gn' => 'givenname',
'rfc822mailbox' => 'email',
'userid' => 'uid',
'emailaddress' => 'email',
'pkcs9email' => 'email',
);
- return isset($aliases[$name]) ? $aliases[$name] : $name;
+
+ list($name, $limit) = explode(':', $namev, 2);
+ $suffix = $limit ? ':'.$limit : '';
+
+ return (isset($aliases[$name]) ? $aliases[$name] : $name) . $suffix;
}
--
Gitblit v1.9.1