Fix handling of 'serialzied' LDAP address attributes

12 years ago · 60d9c79f91
parent e44e5cc79b
commit 60d9c79f91
1 changed files with 8 additions and 1 deletions
--- a/program/include/rcube_ldap.php
+++ b/program/include/rcube_ldap.php
@ -144,7 +144,14 @@ class rcube_ldap extends rcube_addressbook
            }
        }
        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, 'size' => 40);
+
+            // 'serialized' means the UI has to present a composite address field
+            if ($this->coltypes['address']['serialized']) {
+                $childprop = array('type' => 'text');
+                $this->coltypes['address']['type'] = 'composite';
+                $this->coltypes['address']['childs'] = array('street' => $childprop, 'locality' => $childprop, 'zipcode' => $childprop, 'country' => $childprop);
+            }
        }

        // make sure 'required_fields' is an array