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

Support addressbook_search_mode configuration parameter

Browse source
This commit is contained in:
Aleksander Machniak 2011-11-11 14:50:08 +01:00
parent 41edd38326
commit f02613a222
1 changed files with 19 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -335,14 +335,17 @@ class rcube_kolab_contacts extends rcube_addressbook
* *
* @param mixed $fields The field name of array of field names to search in * @param mixed $fields The field name of array of field names to search in
* @param mixed $value Search value (or array of values when $fields is array) * @param mixed $value Search value (or array of values when $fields is array)
* @param boolean $strict True for strict (=), False for partial (LIKE) matching * @param int $mode Matching mode:
* 0 - partial (*abc*),
* 1 - strict (=),
* 2 - prefix (abc*)
* @param boolean $select True if results are requested, False if count only * @param boolean $select True if results are requested, False if count only
* @param boolean $nocount True to skip the count query (select only) * @param boolean $nocount True to skip the count query (select only)
* @param array $required List of fields that cannot be empty * @param array $required List of fields that cannot be empty
* *
* @return object rcube_result_set List of contact records and 'count' value * @return object rcube_result_set List of contact records and 'count' value
*/ */
public function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) public function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
{ {
$this->_fetch_contacts(); $this->_fetch_contacts();
@ -381,7 +384,7 @@ class rcube_kolab_contacts extends rcube_addressbook
$regexp = '/^(' . implode($fields, '|') . ')(?:.*)$/'; $regexp = '/^(' . implode($fields, '|') . ')(?:.*)$/';
// save searching conditions // save searching conditions
$this->filter = array('fields' => $fields, 'value' => $value, 'strict' => $strict, 'ids' => array()); $this->filter = array('fields' => $fields, 'value' => $value, 'mode' => $mode, 'ids' => array());
// search be iterating over all records in memory // search be iterating over all records in memory
foreach ($this->contacts as $id => $contact) { foreach ($this->contacts as $id => $contact) {
@ -403,18 +406,21 @@ class rcube_kolab_contacts extends rcube_addressbook
$search = $value; $search = $value;
} }
$s_len = strlen($search);
foreach ((array)$contact[$col] as $val) { foreach ((array)$contact[$col] as $val) {
// composite field, e.g. address
if (is_array($val)) {
$val = implode($val);
}
$val = mb_strtolower($val); $val = mb_strtolower($val);
switch ($mode) {
case 1:
$got = ($val == $search);
break;
case 2:
$got = ($search == substr($val, 0, strlen($search)));
break;
default:
$got = (strpos($val, $search) !== false);
break;
}
if (($strict && $val == $search) if ($got) {
|| (!$strict && $s_len && strpos($val, $search) !== false)
) {
if (!$advanced) { if (!$advanced) {
$this->filter['ids'][] = $id; $this->filter['ids'][] = $id;
break 2; break 2;
@ -441,7 +447,7 @@ class rcube_kolab_contacts extends rcube_addressbook
public function refresh_search() public function refresh_search()
{ {
if ($this->filter) if ($this->filter)
$this->search($this->filter['fields'], $this->filter['value'], $this->filter['strict']); $this->search($this->filter['fields'], $this->filter['value'], $this->filter['mode']);
return $this->get_search_set(); return $this->get_search_set();
} }