diff options
Diffstat (limited to 'program/include')
| -rw-r--r-- | program/include/rcube_addressbook.php | 8 | ||||
| -rw-r--r-- | program/include/rcube_contacts.php | 81 | ||||
| -rw-r--r-- | program/include/rcube_imap.php | 2 | ||||
| -rw-r--r-- | program/include/rcube_ldap.php | 52 | ||||
| -rw-r--r-- | program/include/rcube_session.php | 7 |
5 files changed, 116 insertions, 34 deletions
diff --git a/program/include/rcube_addressbook.php b/program/include/rcube_addressbook.php index 7270f42fd..5f17f4a8a 100644 --- a/program/include/rcube_addressbook.php +++ b/program/include/rcube_addressbook.php @@ -96,12 +96,16 @@ abstract class rcube_addressbook * * @param array List of fields to search in * @param string Search value + * @param int Matching mode: + * 0 - partial (*abc*), + * 1 - strict (=), + * 2 - prefix (abc*) * @param boolean True if results are requested, False if count only * @param boolean True to skip the count query (select only) * @param array List of fields that cannot be empty * @return object rcube_result_set List of contact records and 'count' value */ - abstract function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()); + abstract function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()); /** * Count number of available contacts in database @@ -399,7 +403,7 @@ abstract class rcube_addressbook { $out = array(); foreach ($data as $c => $values) { - if (strpos($c, $col) === 0) { + if ($c === $col || strpos($c, $col.':') === 0) { if ($flat) { $out = array_merge($out, (array)$values); } diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php index e822d2c24..fe600e008 100644 --- a/program/include/rcube_contacts.php +++ b/program/include/rcube_contacts.php @@ -177,12 +177,12 @@ class rcube_contacts extends rcube_addressbook " AND contactgroup_id=?". " AND user_id=?", $group_id, $this->user_id); - + if ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) { $sql_arr['ID'] = $sql_arr['contactgroup_id']; return $sql_arr; } - + return null; } @@ -268,14 +268,17 @@ class rcube_contacts extends rcube_addressbook * * @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 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 $nocount True to skip the count query (select only) * @param array $required List of fields that cannot be empty * * @return object rcube_result_set Contact records and 'count' value */ - function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) + function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()) { if (!is_array($fields)) $fields = array($fields); @@ -283,6 +286,7 @@ class rcube_contacts extends rcube_addressbook $required = array($required); $where = $and_where = array(); + $mode = intval($mode); foreach ($fields as $idx => $col) { // direct ID search @@ -295,26 +299,56 @@ class rcube_contacts extends rcube_addressbook // fulltext search in all fields else if ($col == '*') { $words = array(); - foreach (explode(" ", self::normalize_string($value)) as $word) - $words[] = $this->db->ilike('words', '%'.$word.'%'); + foreach (explode(" ", self::normalize_string($value)) as $word) { + switch ($mode) { + case 1: // strict + $words[] = '(' . $this->db->ilike('words', $word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word) . ')'; + break; + case 2: // prefix + $words[] = '(' . $this->db->ilike('words', $word.'%') + . ' OR ' . $this->db->ilike('words', '% '.$word.'%') . ')'; + break; + default: // partial + $words[] = $this->db->ilike('words', '%'.$word.'%'); + } + } $where[] = '(' . join(' AND ', $words) . ')'; } else { $val = is_array($value) ? $value[$idx] : $value; // table column if (in_array($col, $this->table_cols)) { - if ($strict) { + switch ($mode) { + case 1: // strict $where[] = $this->db->quoteIdentifier($col).' = '.$this->db->quote($val); - } - else { + break; + case 2: // prefix + $where[] = $this->db->ilike($col, $val.'%'); + break; + default: // partial $where[] = $this->db->ilike($col, '%'.$val.'%'); } } // vCard field else { if (in_array($col, $this->fulltext_cols)) { - foreach (explode(" ", self::normalize_string($val)) as $word) - $words[] = $this->db->ilike('words', '%'.$word.'%'); + foreach (explode(" ", self::normalize_string($val)) as $word) { + switch ($mode) { + case 1: // strict + $words[] = '(' . $this->db->ilike('words', $word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word.' %') + . ' OR ' . $this->db->ilike('words', '% '.$word) . ')'; + break; + case 2: // prefix + $words[] = '(' . $this->db->ilike('words', $word.'%') + . ' OR ' . $this->db->ilike('words', ' '.$word.'%') . ')'; + break; + default: // partial + $words[] = $this->db->ilike('words', '%'.$word.'%'); + } + } $where[] = '(' . join(' AND ', $words) . ')'; } if (is_array($value)) @@ -362,13 +396,24 @@ class rcube_contacts extends rcube_addressbook $search = $post_search[$colname]; foreach ((array)$row[$col] as $value) { // composite field, e.g. address - if (is_array($value)) { - $value = implode($value); - } - $value = mb_strtolower($value); - if (($strict && $value == $search) || (!$strict && strpos($value, $search) !== false)) { - $found[$colname] = true; - break; + foreach ((array)$value as $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 ($got) { + $found[$colname] = true; + break 2; + } } } } diff --git a/program/include/rcube_imap.php b/program/include/rcube_imap.php index 7508acda5..8c1fab8cf 100644 --- a/program/include/rcube_imap.php +++ b/program/include/rcube_imap.php @@ -478,7 +478,7 @@ class rcube_imap */ function get_mailbox_name() { - return $this->conn->connected() ? $this->mailbox : ''; + return $this->mailbox; } diff --git a/program/include/rcube_ldap.php b/program/include/rcube_ldap.php index 00ee1c87b..c1bff53ab 100644 --- a/program/include/rcube_ldap.php +++ b/program/include/rcube_ldap.php @@ -690,15 +690,20 @@ class rcube_ldap extends rcube_addressbook * * @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 boolean $strict True for strict, False for partial (fuzzy) 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 $nocount (Not used) * @param array $required List of fields that cannot be empty * * @return array Indexed list of contact records and 'count' value */ - function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array()) + function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array()) { + $mode = intval($mode); + // special treatment for ID-based search if ($fields == 'ID' || $fields == $this->primary_key) { @@ -730,13 +735,31 @@ class rcube_ldap extends rcube_addressbook array_values($this->fieldmap), 0, (int)$this->prop['sizelimit'], (int)$this->prop['timelimit']); // get all entries of this page and post-filter those that really match the query + $search = mb_strtolower($value); $this->result = new rcube_result_set(0); $entries = ldap_get_entries($this->conn, $this->ldap_result); + for ($i = 0; $i < $entries['count']; $i++) { $rec = $this->_ldap2result($entries[$i]); - if (stripos($rec['name'] . $rec['email'], $value) !== false) { - $this->result->add($rec); - $this->result->count++; + foreach (array('email', 'name') as $f) { + $val = mb_strtolower($rec[$f]); + 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 ($got) { + $this->result->add($rec); + $this->result->count++; + break; + } } } @@ -745,7 +768,14 @@ class rcube_ldap extends rcube_addressbook // use AND operator for advanced searches $filter = is_array($value) ? '(&' : '(|'; - $wc = !$strict && $this->prop['fuzzy_search'] ? '*' : ''; + // set wildcards + $wp = $ws = ''; + if (!empty($this->prop['fuzzy_search']) && $mode != 1) { + $ws = '*'; + if (!$mode) { + $wp = '*'; + } + } if ($fields == '*') { @@ -759,7 +789,7 @@ class rcube_ldap extends rcube_addressbook if (is_array($this->prop['search_fields'])) { foreach ($this->prop['search_fields'] as $field) { - $filter .= "($field=$wc" . $this->_quote_string($value) . "$wc)"; + $filter .= "($field=$wp" . $this->_quote_string($value) . "$ws)"; } } } @@ -768,7 +798,7 @@ 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=$wc" . $this->_quote_string($val) . "$wc)"; + $filter .= "($f=$wp" . $this->_quote_string($val) . "$ws)"; } } } @@ -1417,9 +1447,9 @@ class rcube_ldap extends rcube_addressbook $groups = array(); if ($search) { - $search = strtolower($search); + $search = mb_strtolower($search); foreach ($group_cache as $group) { - if (strstr(strtolower($group['name']), $search)) + if (strpos(mb_strtolower($group['name']), $search) !== false) $groups[] = $group; } } @@ -1495,7 +1525,7 @@ class rcube_ldap extends rcube_addressbook $groups[$group_id]['email'][] = $ldap_data[$i][$email_attr][$j]; } - $group_sortnames[] = strtolower($ldap_data[$i][$sort_attr][0]); + $group_sortnames[] = mb_strtolower($ldap_data[$i][$sort_attr][0]); } // recursive call can exit here diff --git a/program/include/rcube_session.php b/program/include/rcube_session.php index dd28b098f..582b27efa 100644 --- a/program/include/rcube_session.php +++ b/program/include/rcube_session.php @@ -410,9 +410,12 @@ class rcube_session public function reload() { if ($this->key && $this->memcache) - $this->mc_read($this->key); + $data = $this->mc_read($this->key); else if ($this->key) - $this->db_read($this->key); + $data = $this->db_read($this->key); + + if ($data) + session_decode($data); } |