banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Improve definition of composite address fields of LDAP contacts

Browse Source
pull/1/head
thomascube 13 years ago
parent abdf31486a
commit 1937f4638e
1 changed files with 7 additions and 3 deletions
Show Stats Download Patch File Download Diff File

10
program/include/rcube_ldap.php
Unescape Escape View File

@ -107,7 +107,7 @@ class rcube_ldap extends rcube_addressbook
list($col, $type) = explode(':', $col); list($col, $type) = explode(':', $col);
if (!is_array($this->coltypes[$col])) { if (!is_array($this->coltypes[$col])) {
$subtypes = $type ? array($type) : null; $subtypes = $type ? array($type) : null;
$this->coltypes[$col] = array('limit' => 2, 'subtypes' => $subtypes); $this->coltypes[$col] = array('limit' => 1, 'subtypes' => $subtypes);
} }
elseif ($type) { elseif ($type) {
$this->coltypes[$col]['subtypes'][] = $type; $this->coltypes[$col]['subtypes'][] = $type;
@ -117,8 +117,12 @@ class rcube_ldap extends rcube_addressbook
$this->fieldmap[$col] = $lf; $this->fieldmap[$col] = $lf;
} }
if ($this->fieldmap['street'] && $this->fieldmap['locality']) // support for composite address
$this->coltypes['address'] = array('limit' => 1); if ($this->fieldmap['street'] && $this->fieldmap['locality']) {
$this->coltypes['address'] = array('limit' => max(1, $this->coltypes['locality']['limit']), 'subtypes' => $this->coltypes['locality']['subtypes']);
foreach (array('street','locality','zipcode','region','country') as $childcol)
unset($this->coltypes[$childcol]); // remove address child col from global coltypes list
}
else if ($this->coltypes['address']) else if ($this->coltypes['address'])
$this->coltypes['address'] = array('type' => 'textarea', 'childs' => null, 'limit' => 1, 'size' => 40); $this->coltypes['address'] = array('type' => 'textarea', 'childs' => null, 'limit' => 1, 'size' => 40);

Write Preview
Loading…
Cancel
Save