Improve definition of composite address fields of LDAP contacts

thomascube

2011-10-30 1937f4638e27d13ab1892d37df97dafe4dc7b696

Improve definition of composite address fields of LDAP contacts

 program/include/rcube_ldap.php

@@ -107,7 +107,7 @@
            list($col, $type) = explode(':', $col);
            if (!is_array($this->coltypes[$col])) {
                $subtypes = $type ? array($type) : null;
                $this->coltypes[$col] = array('limit' => 2, 'subtypes' => $subtypes);
                $this->coltypes[$col] = array('limit' => 1, 'subtypes' => $subtypes);
            }
            elseif ($type) {
                $this->coltypes[$col]['subtypes'][] = $type;
@@ -117,8 +117,12 @@
                $this->fieldmap[$col] = $lf;
        }

        if ($this->fieldmap['street'] && $this->fieldmap['locality'])
            $this->coltypes['address'] = array('limit' => 1);
        // 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']);
            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'])
            $this->coltypes['address'] = array('type' => 'textarea', 'childs' => null, 'limit' => 1, 'size' => 40);