From 1a2f8375ded7563964ea24c44c7874a92e6f7b77 Mon Sep 17 00:00:00 2001
From: alecpl <alec@alec.pl>
Date: Thu, 12 Aug 2010 03:11:28 -0400
Subject: [PATCH] - add message_part_structure hook also for text parts of mixed messages
---
program/include/rcube_contacts.php | 165 +++++++++++++++++++++++++++++++------------------------
1 files changed, 93 insertions(+), 72 deletions(-)
diff --git a/program/include/rcube_contacts.php b/program/include/rcube_contacts.php
index 7014415..698378a 100644
--- a/program/include/rcube_contacts.php
+++ b/program/include/rcube_contacts.php
@@ -27,8 +27,12 @@
*/
class rcube_contacts extends rcube_addressbook
{
+ // protected for backward compat. with some plugins
+ protected $db_name = 'contacts';
+ protected $db_groups = 'contactgroups';
+ protected $db_groupmembers = 'contactgroupmembers';
+
private $db = null;
- private $db_name = '';
private $user_id = 0;
private $filter = null;
private $result = null;
@@ -36,8 +40,8 @@
private $search_string;
private $cache;
private $table_cols = array('name', 'email', 'firstname', 'surname', 'vcard');
-
- /** public properties */
+
+ // public properties
var $primary_key = 'contact_id';
var $readonly = false;
var $groups = true;
@@ -46,7 +50,7 @@
var $group_id = 0;
var $ready = false;
-
+
/**
* Object constructor
*
@@ -56,7 +60,6 @@
function __construct($dbconn, $user)
{
$this->db = $dbconn;
- $this->db_name = get_table_name('contacts');
$this->user_id = $user;
$this->ready = $this->db && !$this->db->is_error();
}
@@ -73,7 +76,7 @@
$this->cache = null;
}
-
+
/**
* Getter for saved search properties
*
@@ -107,7 +110,7 @@
$this->search_string = null;
$this->cache = null;
}
-
+
/**
* List all active contact groups of this source
@@ -118,14 +121,14 @@
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').
+ "SELECT * FROM ".get_table_name($this->db_groups).
" WHERE del<>1".
" AND user_id=?".
$sql_filter.
@@ -163,11 +166,11 @@
$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($this->db_groupmembers)." AS m".
" ON (m.contact_id = c.".$this->primary_key.")";
$sql_result = $this->db->limitquery(
- "SELECT * FROM ".$this->db_name." AS c" .
+ "SELECT * FROM ".get_table_name($this->db_name)." AS c" .
$join .
" WHERE c.del<>1" .
" AND c.user_id=?" .
@@ -186,7 +189,7 @@
$sql_arr['name'] = $sql_arr['email'];
$this->result->add($sql_arr);
}
-
+
$cnt = count($this->result->records);
// update counter
@@ -200,7 +203,7 @@
else
$this->result->count = $this->_count();
}
-
+
return $this->result;
}
@@ -213,28 +216,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);
+ if (!is_array($required) && !empty($required))
+ $required = array($required);
- $add_where = array();
+ $where = $and_where = array();
+
foreach ($fields as $col) {
if ($col == 'ID' || $col == $this->primary_key) {
- $ids = !is_array($value) ? explode(',', $value) : $value;
- $ids = join(',', array_map(array($this->db, 'quote'), $ids));
- $add_where[] = 'c.' . $this->primary_key.' IN ('.$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
@@ -253,7 +270,7 @@
function count()
{
$count = isset($this->cache['count']) ? $this->cache['count'] : $this->_count();
-
+
return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
}
@@ -266,13 +283,13 @@
private function _count()
{
if ($this->group_id)
- $join = " LEFT JOIN ".get_table_name('contactgroupmembers')." AS m".
+ $join = " LEFT JOIN ".get_table_name($this->db_groupmembers)." 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".
+ " FROM ".get_table_name($this->db_name)." AS c".
$join.
" WHERE c.del<>1".
" AND c.user_id=?".
@@ -299,8 +316,8 @@
{
return $this->result;
}
-
-
+
+
/**
* Get a specific contact record
*
@@ -312,9 +329,9 @@
// 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.
+ "SELECT * FROM ".get_table_name($this->db_name).
" WHERE contact_id=?".
" AND user_id=?".
" AND del<>1",
@@ -358,12 +375,12 @@
if (!$existing->count && !empty($a_insert_cols)) {
$this->db->query(
- "INSERT INTO ".$this->db_name.
+ "INSERT INTO ".get_table_name($this->db_name).
" (user_id, changed, del, ".join(', ', $a_insert_cols).")".
" VALUES (".intval($this->user_id).", ".$this->db->now().", 0, ".join(', ', $a_insert_values).")"
);
- $insert_id = $this->db->insert_id('contacts');
+ $insert_id = $this->db->insert_id($this->db_name);
}
// also add the newly created contact to the active group
@@ -409,7 +426,7 @@
if (!empty($write_sql)) {
$this->db->query(
- "UPDATE ".$this->db_name.
+ "UPDATE ".get_table_name($this->db_name).
" SET changed=".$this->db->now().", ".join(', ', $write_sql).
" WHERE contact_id=?".
" AND user_id=?".
@@ -420,7 +437,7 @@
$updated = $this->db->affected_rows();
}
-
+
return $updated;
}
@@ -435,11 +452,11 @@
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(
- "UPDATE ".$this->db_name.
+ "UPDATE ".get_table_name($this->db_name).
" SET del=1, changed=".$this->db->now().
" WHERE user_id=?".
" AND contact_id IN ($ids)",
@@ -457,7 +474,7 @@
*/
function delete_all()
{
- $this->db->query("DELETE FROM {$this->db_name} WHERE user_id=?", $this->user_id);
+ $this->db->query("DELETE FROM ".get_table_name($this->db_name)." WHERE user_id = ?", $this->user_id);
$this->cache = null;
return $this->db->affected_rows();
}
@@ -475,16 +492,16 @@
// make sure we have a unique name
$name = $this->unique_groupname($name);
-
+
$this->db->query(
- "INSERT INTO ".get_table_name('contactgroups').
+ "INSERT INTO ".get_table_name($this->db_groups).
" (user_id, changed, name)".
" VALUES (".intval($this->user_id).", ".$this->db->now().", ".$this->db->quote($name).")"
);
-
- if ($insert_id = $this->db->insert_id('contactgroups'))
+
+ if ($insert_id = $this->db->insert_id($this->db_groups))
$result = array('id' => $insert_id, 'name' => $name);
-
+
return $result;
}
@@ -499,7 +516,7 @@
{
// flag group record as deleted
$sql_result = $this->db->query(
- "UPDATE ".get_table_name('contactgroups').
+ "UPDATE ".get_table_name($this->db_groups).
" SET del=1, changed=".$this->db->now().
" WHERE contactgroup_id=?",
$gid
@@ -522,9 +539,9 @@
{
// make sure we have a unique name
$name = $this->unique_groupname($newname);
-
+
$sql_result = $this->db->query(
- "UPDATE ".get_table_name('contactgroups').
+ "UPDATE ".get_table_name($this->db_groups).
" SET name=?, changed=".$this->db->now().
" WHERE contactgroup_id=?",
$name, $gid
@@ -545,30 +562,34 @@
{
if (!is_array($ids))
$ids = explode(',', $ids);
-
+
$added = 0;
-
+ $exists = array();
+
+ // get existing assignments ...
+ $sql_result = $this->db->query(
+ "SELECT contact_id FROM ".get_table_name($this->db_groupmembers).
+ " WHERE contactgroup_id=?".
+ " AND contact_id IN (".$this->db->array2list($ids, 'integer').")",
+ $group_id
+ );
+ while ($sql_result && ($sql_arr = $this->db->fetch_assoc($sql_result))) {
+ $exists[] = $sql_arr['contact_id'];
+ }
+ // ... and remove them from the list
+ $ids = array_diff($ids, $exists);
+
foreach ($ids as $contact_id) {
- $sql_result = $this->db->query(
- "SELECT 1 FROM ".get_table_name('contactgroupmembers').
- " WHERE contactgroup_id=?".
- " AND contact_id=?",
+ $this->db->query(
+ "INSERT INTO ".get_table_name($this->db_groupmembers).
+ " (contactgroup_id, contact_id, created)".
+ " VALUES (?, ?, ".$this->db->now().")",
$group_id,
$contact_id
);
- if (!$this->db->num_rows($sql_result)) {
- $this->db->query(
- "INSERT INTO ".get_table_name('contactgroupmembers').
- " (contactgroup_id, contact_id, created)".
- " VALUES (?, ?, ".$this->db->now().")",
- $group_id,
- $contact_id
- );
-
- if (!$this->db->db_error)
- $added++;
- }
+ if (!$this->db->db_error)
+ $added++;
}
return $added;
@@ -587,10 +608,10 @@
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').
+ "DELETE FROM ".get_table_name($this->db_groupmembers).
" WHERE contactgroup_id=?".
" AND contact_id IN ($ids)",
$group_id
@@ -610,21 +631,21 @@
{
$checkname = $name;
$num = 2; $hit = false;
-
+
do {
$sql_result = $this->db->query(
- "SELECT 1 FROM ".get_table_name('contactgroups').
+ "SELECT 1 FROM ".get_table_name($this->db_groups).
" WHERE del<>1".
" AND user_id=?".
" 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