From 25fdec592dc0a37c6ccb0d566e288807aacf9114 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Mon, 10 May 2010 15:38:45 -0400
Subject: [PATCH] - Fix autocomplete shows entries without email (#1486452)
---
program/include/rcube_contacts.php | 135 ++++++++++++++++++++++++++++----------------
1 files changed, 86 insertions(+), 49 deletions(-)
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index f243e10..0660066 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -27,15 +27,18 @@
*/
class rcube_contacts extends rcube_addressbook
{
+ // protected for backward compat. with some plugins
+ // maybe changed in the future
+ protected $db_name = '';
private $db = null;
- private $db_name = '';
private $user_id = 0;
private $filter = null;
private $result = null;
private $search_fields;
private $search_string;
+ private $cache;
private $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');
-
+
/** public properties */
var $primary_key = 'contact_id';
var $readonly = false;
@@ -45,7 +48,7 @@
var $group_id = 0;
var $ready = false;
-
+
/**
* Object constructor
*
@@ -69,9 +72,10 @@
function set_search_set($filter)
{
$this->filter = $filter;
+ $this->cache = null;
}
-
+
/**
* Getter for saved search properties
*
@@ -90,6 +94,7 @@
function set_group($gid)
{
$this->group_id = $gid;
+ $this->cache = null;
}
@@ -102,8 +107,9 @@
$this->filter = null;
$this->search_fields = null;
$this->search_string = null;
+ $this->cache = null;
}
-
+
/**
* List all active contact groups of this source
@@ -114,11 +120,11 @@
function list_groups($search = null)
{
$results = array();
-
+
if (!$this->groups)
return $results;
- $sql_filter = $search ? "AND " . $this->db->ilike('name', '%'.$search.'%') : '';
+ $sql_filter = $search ? " AND " . $this->db->ilike('name', '%'.$search.'%') : '';
$sql_result = $this->db->query(
"SELECT * FROM ".get_table_name('contactgroups').
@@ -159,15 +165,16 @@
$length = $subset != 0 ? abs($subset) : $this->page_size;
if ($this->group_id)
- $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+ $join = " LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
" ON (m.contact_id = c.".$this->primary_key.")";
$sql_result = $this->db->limitquery(
- "SELECT * FROM ".$this->db_name." AS c ".$join .
+ "SELECT * FROM ".$this->db_name." AS c" .
+ $join .
" WHERE c.del<>1" .
- " AND c.user_id=?" .
- ($this->group_id ? " AND m.contactgroup_id=?" : "").
- ($this->filter ? " AND (".$this->filter.")" : "") .
+ " AND c.user_id=?" .
+ ($this->group_id ? " AND m.contactgroup_id=?" : "").
+ ($this->filter ? " AND (".$this->filter.")" : "") .
" ORDER BY c.name",
$start_row,
$length,
@@ -181,7 +188,7 @@
$sql_arr['name'] = $sql_arr['email'];
$this->result->add($sql_arr);
}
-
+
$cnt = count($this->result->records);
// update counter
@@ -190,10 +197,12 @@
else if ($this->list_page <= 1) {
if ($cnt < $this->page_size && $subset == 0)
$this->result->count = $cnt;
+ else if (isset($this->cache['count']))
+ $this->result->count = $this->cache['count'];
else
$this->result->count = $this->_count();
}
-
+
return $this->result;
}
@@ -206,27 +215,42 @@
* @param boolean True for strict (=), False for partial (LIKE) matching
* @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 Indexed list of contact records and 'count' value
*/
- function search($fields, $value, $strict=false, $select=true, $nocount=false)
+ function search($fields, $value, $strict=false, $select=true, $nocount=false, $required=array())
{
if (!is_array($fields))
$fields = array($fields);
-
- $add_where = array();
+ if (!is_array($required) && !empty($required))
+ $required = array($required);
+
+ $where = $and_where = array();
+
foreach ($fields as $col) {
if ($col == 'ID' || $col == $this->primary_key) {
- $ids = !is_array($value) ? explode(',', $value) : $value;
- $add_where[] = 'c.' . $this->primary_key.' IN ('.join(',', $ids).')';
+ $ids = !is_array($value) ? explode(',', $value) : $value;
+ $ids = $this->db->array2list($ids, 'integer');
+ $where[] = 'c.' . $this->primary_key.' IN ('.$ids.')';
}
else if ($strict)
- $add_where[] = $this->db->quoteIdentifier($col).'='.$this->db->quote($value);
+ $where[] = $this->db->quoteIdentifier($col).' = '.$this->db->quote($value);
else
- $add_where[] = $this->db->ilike($col, '%'.$value.'%');
+ $where[] = $this->db->ilike($col, '%'.$value.'%');
}
-
- if (!empty($add_where)) {
- $this->set_search_set(join(' OR ', $add_where));
+
+ foreach ($required as $col) {
+ $and_where[] = $this->db->quoteIdentifier($col).' <> '.$this->db->quote('');
+ }
+
+ if (!empty($where))
+ $where = join(' OR ', $where);
+
+ if (!empty($and_where))
+ $where = ($where ? "($where) AND " : '') . join(' AND ', $and_where);
+
+ if (!empty($where)) {
+ $this->set_search_set($where);
if ($select)
$this->list_records(null, 0, $nocount);
else
@@ -244,7 +268,9 @@
*/
function count()
{
- return new rcube_result_set($this->_count(), ($this->list_page-1) * $this->page_size);
+ $count = isset($this->cache['count']) ? $this->cache['count'] : $this->_count();
+
+ return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
}
@@ -256,14 +282,15 @@
private function _count()
{
if ($this->group_id)
- $join = "LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+ $join = " LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
" ON (m.contact_id=c.".$this->primary_key.")";
-
+
// count contacts for this user
$sql_result = $this->db->query(
"SELECT COUNT(c.contact_id) AS rows".
- " FROM ".$this->db_name." AS c ".$join.
- " WHERE c.del<>1".
+ " FROM ".$this->db_name." AS c".
+ $join.
+ " WHERE c.del<>1".
" AND c.user_id=?".
($this->group_id ? " AND m.contactgroup_id=?" : "").
($this->filter ? " AND (".$this->filter.")" : ""),
@@ -272,7 +299,10 @@
);
$sql_arr = $this->db->fetch_assoc($sql_result);
- return (int) $sql_arr['rows'];
+
+ $this->cache['count'] = (int) $sql_arr['rows'];
+
+ return $this->cache['count'];
}
@@ -285,8 +315,8 @@
{
return $this->result;
}
-
-
+
+
/**
* Get a specific contact record
*
@@ -298,7 +328,7 @@
// return cached result
if ($this->result && ($first = $this->result->first()) && $first[$this->primary_key] == $id)
return $assoc ? $first : $this->result;
-
+
$this->db->query(
"SELECT * FROM ".$this->db_name.
" WHERE contact_id=?".
@@ -356,6 +386,8 @@
if ($insert_id && $this->group_id)
$this->add_to_group($this->group_id, $insert_id);
+ $this->cache = null;
+
return $insert_id;
}
@@ -404,7 +436,7 @@
$updated = $this->db->affected_rows();
}
-
+
return $updated;
}
@@ -416,10 +448,10 @@
*/
function delete($ids)
{
- if (is_array($ids))
- $ids = join(',', $ids);
+ if (!is_array($ids))
+ $ids = explode(',', $ids);
- $ids = join(',', array_map(array($this->db, 'quote'), $ids));
+ $ids = $this->db->array2list($ids, 'integer');
// flag record as deleted
$this->db->query(
@@ -429,6 +461,8 @@
" AND contact_id IN ($ids)",
$this->user_id
);
+
+ $this->cache = null;
return $this->db->affected_rows();
}
@@ -440,6 +474,7 @@
function delete_all()
{
$this->db->query("DELETE FROM {$this->db_name} WHERE user_id=?", $this->user_id);
+ $this->cache = null;
return $this->db->affected_rows();
}
@@ -456,16 +491,16 @@
// make sure we have a unique name
$name = $this->unique_groupname($name);
-
+
$this->db->query(
"INSERT INTO ".get_table_name('contactgroups').
" (user_id, changed, name)".
" VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
);
-
+
if ($insert_id = $this->db->insert_id('contactgroups'))
$result = array('id' => $insert_id, 'name' => $name);
-
+
return $result;
}
@@ -486,6 +521,8 @@
$gid
);
+ $this->cache = null;
+
return $this->db->affected_rows();
}
@@ -501,7 +538,7 @@
{
// make sure we have a unique name
$name = $this->unique_groupname($newname);
-
+
$sql_result = $this->db->query(
"UPDATE ".get_table_name('contactgroups').
" SET name=?, changed=".$this->db->now().
@@ -524,9 +561,9 @@
{
if (!is_array($ids))
$ids = explode(',', $ids);
-
+
$added = 0;
-
+
foreach ($ids as $contact_id) {
$sql_result = $this->db->query(
"SELECT 1 FROM ".get_table_name('contactgroupmembers').
@@ -566,8 +603,8 @@
if (!is_array($ids))
$ids = explode(',', $ids);
- $ids = join(',', array_map(array($this->db, 'quote'), $ids));
-
+ $ids = $this->db->array2list($ids, 'integer');
+
$sql_result = $this->db->query(
"DELETE FROM ".get_table_name('contactgroupmembers').
" WHERE contactgroup_id=?".
@@ -589,21 +626,21 @@
{
$checkname = $name;
$num = 2; $hit = false;
-
+
do {
$sql_result = $this->db->query(
"SELECT 1 FROM ".get_table_name('contactgroups').
" WHERE del<>1".
" AND user_id=?".
- " AND name LIKE ?",
+ " AND name=?",
$this->user_id,
$checkname);
-
+
// append number to make name unique
if ($hit = $this->db->num_rows($sql_result))
$checkname = $name . ' ' . $num++;
} while ($hit > 0);
-
+
return $checkname;
}
--
Gitblit v1.9.1