diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_addressbook.php | 5 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 59 | ||||
| -rw-r--r-- | program/include/rcube_vcard.php | 24 |
3 files changed, 64 insertions, 24 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index f4f255322..892ae263a 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -434,6 +434,11 @@ abstract class rcube_addressbook } } + // remove duplicates + if ($flat && !empty($out)) { + $out = array_unique($out); + } + return $out; } diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index ad2ccddeb..b9b6490fa 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -109,24 +109,22 @@ 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; + $this->fieldmap[$colv] = $lf; } // support for composite address - 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'], (array)$this->coltypes['locality']['subtypes']), @@ -134,7 +132,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 } @@ -468,8 +466,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]; } @@ -858,8 +856,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 .= ')'; } } } @@ -867,9 +870,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 . ')'; @@ -1498,7 +1508,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; @@ -1521,11 +1531,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']; } @@ -1558,8 +1568,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) { diff --git a/program/include/rcube_vcard.php b/program/include/rcube_vcard.php index 49b312c5c..00903c257 100644 --- a/program/include/rcube_vcard.php +++ b/program/include/rcube_vcard.php @@ -50,7 +50,7 @@ class rcube_vcard 'spouse' => 'X-SPOUSE', 'edit' => 'X-AB-EDIT', ); - private $typemap = array('iPhone' => 'mobile', 'CELL' => 'mobile', 'WORK,FAX' => 'workfax'); + private $typemap = array('IPHONE' => 'mobile', 'CELL' => 'mobile', 'WORK,FAX' => 'workfax'); private $phonetypemap = array('HOME1' => 'HOME', 'BUSINESS1' => 'WORK', 'BUSINESS2' => 'WORK2', 'BUSINESSFAX' => 'WORK,FAX'); private $addresstypemap = array('BUSINESS' => 'WORK'); private $immap = array('X-JABBER' => 'jabber', 'X-ICQ' => 'icq', 'X-MSN' => 'msn', 'X-AIM' => 'aim', 'X-YAHOO' => 'yahoo', 'X-SKYPE' => 'skype', 'X-SKYPE-USERNAME' => 'skype'); @@ -159,7 +159,18 @@ class rcube_vcard if (!empty($raw['type'])) { $combined = join(',', self::array_filter((array)$raw['type'], 'internet,pref', true)); - $subtype = $typemap[$combined] ? $typemap[$combined] : ($typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k])); + $combined = strtoupper($combined); + + if ($typemap[$combined]) { + $subtype = $typemap[$combined]; + } + else if ($typemap[$raw['type'][++$k]]) { + $subtype = $typemap[$raw['type'][$k]]; + } + else { + $subtype = strtolower($raw['type'][$k]); + } + while ($k < count($raw['type']) && ($subtype == 'internet' || $subtype == 'pref')) $subtype = $typemap[$raw['type'][++$k]] ? $typemap[$raw['type'][$k]] : strtolower($raw['type'][$k]); } @@ -167,8 +178,11 @@ class rcube_vcard // read vcard 2.1 subtype if (!$subtype) { foreach ($raw as $k => $v) { - if (!is_numeric($k) && $v === true && !in_array(strtolower($k), array('pref','internet','voice','base64'))) { - $subtype = $typemap[$k] ? $typemap[$k] : strtolower($k); + if (!is_numeric($k) && $v === true && ($k = strtolower($k)) + && !in_array($k, array('pref','internet','voice','base64')) + ) { + $k_uc = strtoupper($k); + $subtype = $typemap[$k_uc] ? $typemap[$k_uc] : $k; break; } } @@ -335,7 +349,7 @@ class rcube_vcard $index = count($this->raw[$tag]); $this->raw[$tag][$index] = (array)$value; if ($type) - $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type] ? $typemap[$type] : $type)); + $this->raw[$tag][$index]['type'] = explode(',', ($typemap[$type_uc] ? $typemap[$type_uc] : $type)); } break; } |