Drive/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Improve contacts search by matching words against contact properties instead of the entire search string

Browse source
This commit is contained in:
Thomas Bruederli 2015-03-03 17:05:20 +01:00
parent ae2bd00732
commit ac96c929dd
1 changed files with 10 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
View file

@ -467,27 +467,27 @@ class rcube_kolab_contacts extends rcube_addressbook
} }
$found = array(); $found = array();
$contents = '';
foreach (preg_grep($regexp, array_keys($contact)) as $col) { foreach (preg_grep($regexp, array_keys($contact)) as $col) {
$pos = strpos($col, ':'); $pos = strpos($col, ':');
$colname = $pos ? substr($col, 0, $pos) : $col; $colname = $pos ? substr($col, 0, $pos) : $col;
$search = $advanced ? $value[array_search($colname, $fields)] : $value;
foreach ((array)$contact[$col] as $val) { foreach ((array)$contact[$col] as $val) {
if ($this->compare_search_value($colname, $val, $search, $mode)) { if ($advanced) {
if (!$advanced) { $found[$colname] = $this->compare_search_value($colname, $val, $value[array_search($colname, $fields)], $mode);
$this->filter['ids'][] = $id;
break 2;
} }
else { else {
$found[$colname] = true; $contents .= ' ' . join(' ', (array)$val);
}
} }
} }
} }
if (count($found) >= $scount) // && $advanced // compare matches
if (($advanced && count($found) >= $scount) ||
(!$advanced && rcube_utils::words_match(mb_strtolower($contents), $value))) {
$this->filter['ids'][] = $id; $this->filter['ids'][] = $id;
} }
}
// dummy result with contacts count // dummy result with contacts count
if (!$select) { if (!$select) {