Changeset 6139 in subversion

Timestamp:

May 2, 2012 5:25:47 PM (13 months ago)

Author:

thomasb

Message:

Fix handling of 'serialzied' LDAP address attributes

File:

• trunk/roundcubemail/program/include/rcube_ldap.php (modified) (1 diff)

trunk/roundcubemail/program/include/rcube_ldap.php

@@ -144 +144 @@
         }
         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);
+            }
         }