diff options
Diffstat (limited to 'program')
| -rw-r--r-- | program/include/rcube_ldap.php | 59 |
1 files changed, 40 insertions, 19 deletions
diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index fef940d8a..e3e7a87a0 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -109,23 +109,21 @@ class rcube_ldap extends rcube_addressbook if (!is_array($this->coltypes[$col])) { $subtypes = $type ? array($type) : null; - $this->coltypes[$col] = array('limit' => $limit, 'subtypes' => $subtypes); + $this->coltypes[$col] = array('limit' => $limit, 'subtypes' => $subtypes, 'attributes' => array($lf)); } elseif ($type) { $this->coltypes[$col]['subtypes'][] = $type; + $this->coltypes[$col]['attributes'][] = $lf; $this->coltypes[$col]['limit'] += $limit; } if ($delim) $this->coltypes[$col]['serialized'][$type] = $delim; - if ($type && !$this->fieldmap[$col]) - $this->fieldmap[$col] = $lf; - $this->fieldmap[$colv] = $lf; } - if ($this->fieldmap['street'] && $this->fieldmap['locality']) { + if ($this->coltypes['street'] && $this->coltypes['locality']) { $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']), @@ -133,7 +131,7 @@ class rcube_ldap extends rcube_addressbook ) + (array)$this->coltypes['address']; foreach (array('street','locality','zipcode','region','country') as $childcol) { - if ($this->fieldmap[$childcol]) { + if ($this->coltypes[$childcol]) { $this->coltypes['address']['childs'][$childcol] = array('type' => 'text'); unset($this->coltypes[$childcol]); // remove address child col from global coltypes list } @@ -441,8 +439,8 @@ class rcube_ldap extends rcube_addressbook */ function set_sort_order($sort_col, $sort_order = null) { - if ($this->fieldmap[$sort_col]) - $this->sort_col = $this->fieldmap[$sort_col]; + if ($this->coltypes[$sort_col]['attributes']) + $this->sort_col = $this->coltypes[$sort_col]['attributes'][0]; } @@ -828,8 +826,13 @@ class rcube_ldap extends rcube_addressbook { foreach ((array)$fields as $idx => $field) { $val = is_array($value) ? $value[$idx] : $value; - if ($f = $this->_map_field($field)) { - $filter .= "($f=$wp" . $this->_quote_string($val) . "$ws)"; + if ($attrs = $this->_map_field($field)) { + if (count($attrs) > 1) + $filter .= '(|'; + foreach ($attrs as $f) + $filter .= "($f=$wp" . $this->_quote_string($val) . "$ws)"; + if (count($attrs) > 1) + $filter .= ')'; } } } @@ -837,9 +840,16 @@ class rcube_ldap extends rcube_addressbook // add required (non empty) fields filter $req_filter = ''; - foreach ((array)$required as $field) - if ($f = $this->_map_field($field)) - $req_filter .= "($f=*)"; + foreach ((array)$required as $field) { + if ($attrs = $this->_map_field($field)) { + if (count($attrs) > 1) + $req_filter .= '(|'; + foreach ($attrs as $f) + $req_filter .= "($f=*)"; + if (count($attrs) > 1) + $req_filter .= ')'; + } + } if (!empty($req_filter)) $filter = '(&' . $req_filter . $filter . ')'; @@ -1323,7 +1333,7 @@ class rcube_ldap extends rcube_addressbook list($col, $subtype) = explode(':', $rf); $out['_raw_attrib'][$lf][$i] = $value; - if ($rf == 'email' && $this->mail_domain && !strpos($value, '@')) + if ($col == 'email' && $this->mail_domain && !strpos($value, '@')) $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; @@ -1346,11 +1356,11 @@ class rcube_ldap extends rcube_addressbook /** - * Return real field name (from fields map) + * Return LDAP attribute(s) for the given field */ private function _map_field($field) { - return $this->fieldmap[$field]; + return (array)$this->coltypes[$field]['attributes']; } @@ -1383,8 +1393,19 @@ class rcube_ldap extends rcube_addressbook } $ldap_data = array(); - foreach ($this->fieldmap as $col => $fld) { - $val = $save_cols[$col]; + foreach ($this->fieldmap as $rf => $fld) { + $val = $save_cols[$rf]; + + // check for value in base field (eg.g email instead of email:foo) + list($col, $subtype) = explode(':', $rf); + if (!$val && !empty($save_cols[$col])) { + $val = $save_cols[$col]; + unset($save_cols[$col]); // only use this value once + } + else if (!$val && !$subtype) { // extract values from subtype cols + $val = $this->get_col_values($col, $save_cols, true); + } + if (is_array($val)) $val = array_filter($val); // remove empty entries if ($fld && $val) { @@ -1392,7 +1413,7 @@ class rcube_ldap extends rcube_addressbook $ldap_data[$fld] = $val; } } - + return $ldap_data; } |