No OneTemporary
Actions

Size

78 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
	index 37ba1f15..5b7fd8d5 100644
	--- a/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
	+++ b/plugins/kolab_addressbook/lib/rcube_kolab_contacts.php
	@@ -1,1134 +1,1149 @@
	<?php

	/**
	* Backend class for a custom address book
	*
	* This part of the Roundcube+Kolab integration and connects the
	* rcube_addressbook interface with the kolab_storage wrapper from libkolab
	*
	* @author Thomas Bruederli <bruederli@kolabsys.com>
	* @author Aleksander Machniak <machniak@kolabsys.com>
	*
	* Copyright (C) 2011, Kolab Systems AG <contact@kolabsys.com>
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Affero General Public License as
	* published by the Free Software Foundation, either version 3 of the
	* License, or (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Affero General Public License for more details.
	*
	* You should have received a copy of the GNU Affero General Public License
	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	*
	* @see rcube_addressbook
	*/
	class rcube_kolab_contacts extends rcube_addressbook
	{
	public $primary_key = 'ID';
	public $readonly = true;
	public $editable = false;
	public $undelete = true;
	public $groups = true;
	public $coltypes = array(
	'name' => array('limit' => 1),
	'firstname' => array('limit' => 1),
	'surname' => array('limit' => 1),
	'middlename' => array('limit' => 1),
	'prefix' => array('limit' => 1),
	'suffix' => array('limit' => 1),
	'nickname' => array('limit' => 1),
	'jobtitle' => array('limit' => 1),
	'organization' => array('limit' => 1),
	'department' => array('limit' => 1),
	'email' => array('subtypes' => null),
	'phone' => array(),
	'address' => array('subtypes' => array('home','work','office')),
	'website' => array('subtypes' => array('homepage','blog')),
	'im' => array('subtypes' => null),
	'gender' => array('limit' => 1),
	'birthday' => array('limit' => 1),
	'anniversary' => array('limit' => 1),
	'profession' => array('type' => 'text', 'size' => 40, 'maxlength' => 80, 'limit' => 1,
	'label' => 'kolab_addressbook.profession', 'category' => 'personal'),
	'manager' => array('limit' => null),
	'assistant' => array('limit' => null),
	'spouse' => array('limit' => 1),
	'children' => array('type' => 'text', 'size' => 40, 'maxlength' => 80, 'limit' => null,
	'label' => 'kolab_addressbook.children', 'category' => 'personal'),
	'freebusyurl' => array('type' => 'text', 'size' => 40, 'limit' => 1,
	'label' => 'kolab_addressbook.freebusyurl'),
	'pgppublickey' => array('type' => 'textarea', 'size' => 70, 'rows' => 10, 'limit' => 1,
	'label' => 'kolab_addressbook.pgppublickey'),
	'pkcs7publickey' => array('type' => 'textarea', 'size' => 70, 'rows' => 10, 'limit' => 1,
	'label' => 'kolab_addressbook.pkcs7publickey'),
	'notes' => array(),
	'photo' => array(),
	// TODO: define more Kolab-specific fields such as: language, latitude, longitude, crypto settings
	);

	/**
	* vCard additional fields mapping
	*/
	public $vcard_map = array(
	'profession' => 'X-PROFESSION',
	'officelocation' => 'X-OFFICE-LOCATION',
	'initials' => 'X-INITIALS',
	'children' => 'X-CHILDREN',
	'freebusyurl' => 'X-FREEBUSY-URL',
	'pgppublickey' => 'KEY',
	);

	private $gid;
	private $storagefolder;
	private $contacts;
	private $distlists;
	private $groupmembers;
	private $filter;
	private $result;
	private $namespace;
	private $imap_folder = 'INBOX/Contacts';
	private $action;


	public function __construct($imap_folder = null)
	{
	if ($imap_folder) {
	$this->imap_folder = $imap_folder;
	}

	// extend coltypes configuration
	$format = kolab_format::factory('contact');
	$this->coltypes['phone']['subtypes'] = array_keys($format->phonetypes);
	$this->coltypes['address']['subtypes'] = array_keys($format->addresstypes);

	// set localized labels for proprietary cols
	foreach ($this->coltypes as $col => $prop) {
	if (is_string($prop['label']))
	$this->coltypes[$col]['label'] = rcube_label($prop['label']);
	}

	// fetch objects from the given IMAP folder
	$this->storagefolder = kolab_storage::get_folder($this->imap_folder);
	$this->ready = $this->storagefolder && !PEAR::isError($this->storagefolder);

	// Set readonly and editable flags according to folder permissions
	if ($this->ready) {
	if ($this->storagefolder->get_owner() == $_SESSION['username']) {
	$this->editable = true;
	$this->readonly = false;
	}
	else {
	$rights = $this->storagefolder->get_myrights();
	if (!PEAR::isError($rights)) {
	if (strpos($rights, 'i') !== false)
	$this->readonly = false;
	if (strpos($rights, 'a') !== false \|\| strpos($rights, 'x') !== false)
	$this->editable = true;
	}
	}
	}

	$this->action = rcmail::get_instance()->action;
	}


	/**
	* Getter for the address book name to be displayed
	*
	* @return string Name of this address book
	*/
	public function get_name()
	{
	$folder = kolab_storage::object_name($this->imap_folder, $this->namespace);
	return $folder;
	}


	/**
	* Getter for the IMAP folder name
	*
	* @return string Name of the IMAP folder
	*/
	public function get_realname()
	{
	return $this->imap_folder;
	}


	/**
	* Getter for the name of the namespace to which the IMAP folder belongs
	*
	* @return string Name of the namespace (personal, other, shared)
	*/
	public function get_namespace()
	{
	if ($this->namespace === null && $this->ready) {
	$this->namespace = $this->storagefolder->get_namespace();
	}

	return $this->namespace;
	}


	/**
	* Setter for the current group
	*/
	public function set_group($gid)
	{
	$this->gid = $gid;
	}


	/**
	* Save a search string for future listings
	*
	* @param mixed Search params to use in listing method, obtained by get_search_set()
	*/
	public function set_search_set($filter)
	{
	$this->filter = $filter;
	}


	/**
	* Getter for saved search properties
	*
	* @return mixed Search properties used by this class
	*/
	public function get_search_set()
	{
	return $this->filter;
	}


	/**
	* Reset saved results and search parameters
	*/
	public function reset()
	{
	$this->result = null;
	$this->filter = null;
	}


	/**
	* List all active contact groups of this source
	*
	* @param string Optional search string to match group name
	* @return array Indexed list of contact groups, each a hash array
	*/
	function list_groups($search = null)
	{
	$this->_fetch_groups();
	$groups = array();
	foreach ((array)$this->distlists as $group) {
	if (!$search \|\| strstr(strtolower($group['name']), strtolower($search)))
	$groups[$group['name']] = array('ID' => $group['ID'], 'name' => $group['name']);
	}

	// sort groups
	ksort($groups, SORT_LOCALE_STRING);

	return array_values($groups);
	}


	/**
	* List the current set of contact records
	*
	* @param array List of cols to show
	* @param int Only return this number of records, use negative values for tail
	* @return array Indexed list of contact records, each a hash array
	*/
	public function list_records($cols=null, $subset=0)
	{
	$this->result = $this->count();

	// list member of the selected group
	if ($this->gid) {
	$this->_fetch_groups();
	$seen = array();
	$this->result->count = 0;
	foreach ((array)$this->distlists[$this->gid]['member'] as $member) {
	// skip member that don't match the search filter
	if (is_array($this->filter['ids']) && array_search($member['ID'], $this->filter['ids']) === false)
	continue;

	if ($member['uid'] && ($contact = $this->storagefolder->get_object($member['uid'])) && !$seen[$member['ID']]++) {
	$this->contacts[$member['ID']] = $this->_to_rcube_contact($contact);
	$this->result->count++;
	}
	else if ($member['email'] && !$seen[$member['ID']]++) {
	$this->contacts[$member['ID']] = $member;
	$this->result->count++;
	}
	}
	$ids = array_keys($seen);
	}
	else {
	$this->_fetch_contacts();
	$ids = is_array($this->filter['ids']) ? $this->filter['ids'] : array_keys($this->contacts);
	}

	// sort data arrays according to desired list sorting
	if ($count = count($ids)) {
	uasort($this->contacts, array($this, '_sort_contacts_comp'));
	// get sorted IDs
	if ($count != count($this->contacts))
	$ids = array_values(array_intersect(array_keys($this->contacts), $ids));
	else
	$ids = array_keys($this->contacts);
	}

	// fill contact data into the current result set
	$start_row = $subset < 0 ? $this->result->first + $this->page_size + $subset : $this->result->first;
	$last_row = min($subset != 0 ? $start_row + abs($subset) : $this->result->first + $this->page_size, $count);

	for ($i = $start_row; $i < $last_row; $i++) {
	if ($id = $ids[$i])
	$this->result->add($this->contacts[$id]);
	}

	return $this->result;
	}


	/**
	* Search records
	*
	* @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 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 List of contact records and 'count' value
	*/
	public function search($fields, $value, $mode=0, $select=true, $nocount=false, $required=array())
	{
	- $this->_fetch_contacts();
	-
	// search by ID
	if ($fields == $this->primary_key) {
	$ids = !is_array($value) ? explode(',', $value) : $value;
	$result = new rcube_result_set();

	foreach ($ids as $id) {
	if ($rec = $this->get_record($id, true)) {
	$result->add($rec);
	$result->count++;
	}
	}
	return $result;
	}
	else if ($fields == '*') {
	$fields = array_keys($this->coltypes);
	}

	if (!is_array($fields))
	$fields = array($fields);
	if (!is_array($required) && !empty($required))
	$required = array($required);

	// advanced search
	if (is_array($value)) {
	$advanced = true;
	$value = array_map('mb_strtolower', $value);
	}
	else
	$value = mb_strtolower($value);

	$scount = count($fields);
	// build key name regexp
	$regexp = '/^(' . implode($fields, '\|') . ')(?:.*)$/';

	+ // pass query to storage if only indexed cols are involved
	+ // NOTE: this is only some rough pre-filtering but probably includes false positives
	+ $squery = array();
	+ if (count(array_intersect(kolab_format_contact::$fulltext_cols, $fields)) == $scount) {
	+ switch ($mode) {
	+ case 1: $prefix = ' '; $suffix = ' '; break; // strict
	+ case 2: $prefix = ' '; $suffix = ''; break; // prefix
	+ default: $prefix = ''; $suffix = ''; break; // substring
	+ }
	+
	+ $search_string = is_array($value) ? join(' ', $value) : $value;
	+ foreach (rcube_utils::normalize_string($search_string, true) as $word) {
	+ $squery[] = array('words', 'LIKE', '%' . $prefix . $word . $suffix . '%');
	+ }
	+ }
	+
	+ // get all/matching records
	+ $this->_fetch_contacts($squery);
	+
	// save searching conditions
	$this->filter = array('fields' => $fields, 'value' => $value, 'mode' => $mode, 'ids' => array());

	// search be iterating over all records in memory
	foreach ($this->contacts as $id => $contact) {
	// check if current contact has required values, otherwise skip it
	if ($required) {
	foreach ($required as $f)
	if (empty($contact[$f]))
	continue 2;
	}

	$found = array();
	foreach (preg_grep($regexp, array_keys($contact)) as $col) {
	if ($advanced) {
	$pos = strpos($col, ':');
	$colname = $pos ? substr($col, 0, $pos) : $col;
	$search = $value[array_search($colname, $fields)];
	}
	else {
	$search = $value;
	}

	foreach ((array)$contact[$col] 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;
	+ foreach ((array)$val as $str) {
	+ $str = mb_strtolower($str);
	+ switch ($mode) {
	+ case 1:
	+ $got = ($str == $search);
	+ break;
	+ case 2:
	+ $got = ($search == substr($str, 0, strlen($search)));
	+ break;
	+ default:
	+ $got = (strpos($str, $search) !== false);
	+ break;
	+ }
	}

	if ($got) {
	if (!$advanced) {
	$this->filter['ids'][] = $id;
	break 2;
	}
	else {
	$found[$colname] = true;
	}
	}
	}
	}

	if (count($found) >= $scount) // && $advanced
	$this->filter['ids'][] = $id;
	}

	// list records (now limited by $this->filter)
	return $this->list_records();
	}


	/**
	* Refresh saved search results after data has changed
	*/
	public function refresh_search()
	{
	if ($this->filter)
	$this->search($this->filter['fields'], $this->filter['value'], $this->filter['mode']);

	return $this->get_search_set();
	}


	/**
	* Count number of available contacts in database
	*
	* @return rcube_result_set Result set with values for 'count' and 'first'
	*/
	public function count()
	{
	if ($this->gid) {
	$this->_fetch_groups();
	$count = count($this->distlists[$this->gid]['member']);
	}
	else if (is_array($this->filter['ids'])) {
	$count = count($this->filter['ids']);
	}
	else {
	$count = $this->storagefolder->count();
	}

	return new rcube_result_set($count, ($this->list_page-1) * $this->page_size);
	}


	/**
	* Return the last result set
	*
	* @return rcube_result_set Current result set or NULL if nothing selected yet
	*/
	public function get_result()
	{
	return $this->result;
	}


	/**
	* Get a specific contact record
	*
	* @param mixed record identifier(s)
	* @param boolean True to return record as associative array, otherwise a result set is returned
	* @return mixed Result object with all record fields or False if not found
	*/
	public function get_record($id, $assoc=false)
	{
	$rec = null;
	$uid = $this->_id2uid($id);
	if (strpos($uid, 'mailto:') === 0) {
	$this->_fetch_groups(true);
	$rec = $this->contacts[$id];
	$this->readonly = true; // set source to read-only
	}
	else if ($object = $this->storagefolder->get_object($uid)) {
	$rec = $this->_to_rcube_contact($object);
	}

	if ($rec) {
	$this->result = new rcube_result_set(1);
	$this->result->add($rec);
	return $assoc ? $rec : $this->result;
	}

	return false;
	}


	/**
	* Get group assignments of a specific contact record
	*
	* @param mixed Record identifier
	* @return array List of assigned groups as ID=>Name pairs
	*/
	public function get_record_groups($id)
	{
	$out = array();
	$this->_fetch_groups();

	foreach ((array)$this->groupmembers[$id] as $gid) {
	if ($group = $this->distlists[$gid])
	$out[$gid] = $group['name'];
	}

	return $out;
	}


	/**
	* Create a new contact record
	*
	* @param array Assoziative array with save data
	* Keys: Field name with optional section in the form FIELD:SECTION
	* Values: Field value. Can be either a string or an array of strings for multiple values
	* @param boolean True to check for duplicates first
	* @return mixed The created record ID on success, False on error
	*/
	public function insert($save_data, $check=false)
	{
	if (!is_array($save_data))
	return false;

	$insert_id = $existing = false;

	// check for existing records by e-mail comparison
	if ($check) {
	foreach ($this->get_col_values('email', $save_data, true) as $email) {
	if (($res = $this->search('email', $email, true, false)) && $res->count) {
	$existing = true;
	break;
	}
	}
	}

	if (!$existing) {
	// generate new Kolab contact item
	$object = $this->_from_rcube_contact($save_data);
	$saved = $this->storagefolder->save($object, 'contact');

	if (!$saved) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving contact object to Kolab server"),
	true, false);
	}
	else {
	$contact = $this->_to_rcube_contact($object);
	$id = $contact['ID'];
	$this->contacts[$id] = $contact;
	$insert_id = $id;
	}
	}

	return $insert_id;
	}


	/**
	* Update a specific contact record
	*
	* @param mixed Record identifier
	* @param array Assoziative array with save data
	* Keys: Field name with optional section in the form FIELD:SECTION
	* Values: Field value. Can be either a string or an array of strings for multiple values
	* @return boolean True on success, False on error
	*/
	public function update($id, $save_data)
	{
	$updated = false;
	if ($old = $this->storagefolder->get_object($this->_id2uid($id))) {
	$object = $this->_from_rcube_contact($save_data, $old);

	if (!$this->storagefolder->save($object, 'contact', $old['uid'])) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving contact object to Kolab server"),
	true, false);
	}
	else {
	$this->contacts[$id] = $this->_to_rcube_contact($object);
	$updated = true;

	// TODO: update data in groups this contact is member of
	}
	}

	return $updated;
	}


	/**
	* Mark one or more contact records as deleted
	*
	* @param array Record identifiers
	* @param boolean Remove record(s) irreversible (mark as deleted otherwise)
	*
	* @return int Number of records deleted
	*/
	public function delete($ids, $force=true)
	{
	$this->_fetch_groups();

	if (!is_array($ids))
	$ids = explode(',', $ids);

	$count = 0;
	foreach ($ids as $id) {
	if ($uid = $this->_id2uid($id)) {
	$is_mailto = strpos($uid, 'mailto:') === 0;
	$deleted = $is_mailto \|\| $this->storagefolder->delete($uid, $force);

	if (!$deleted) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error deleting a contact object $uid from the Kolab server"),
	true, false);
	}
	else {
	// remove from distribution lists
	foreach ((array)$this->groupmembers[$id] as $gid) {
	if (!$is_mailto \|\| $gid == $this->gid)
	$this->remove_from_group($gid, $id);
	}

	// clear internal cache
	unset($this->contacts[$id], $this->groupmembers[$id]);
	$count++;
	}
	}
	}

	return $count;
	}


	/**
	* Undelete one or more contact records.
	* Only possible just after delete (see 2nd argument of delete() method).
	*
	* @param array Record identifiers
	*
	* @return int Number of records restored
	*/
	public function undelete($ids)
	{
	if (!is_array($ids))
	$ids = explode(',', $ids);

	$count = 0;
	foreach ($ids as $id) {
	$uid = $this->_id2uid($id);
	if ($this->storagefolder->undelete($uid)) {
	$count++;
	}
	else {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error undeleting a contact object $uid from the Kolab server"),
	true, false);
	}
	}

	return $count;
	}


	/**
	* Remove all records from the database
	*/
	public function delete_all()
	{
	if ($this->storagefolder->delete_all()) {
	$this->contacts = array();
	$this->result = null;
	}
	}


	/**
	* Close connection to source
	* Called on script shutdown
	*/
	public function close()
	{
	}


	/**
	* Create a contact group with the given name
	*
	* @param string The group name
	* @return mixed False on error, array with record props in success
	*/
	function create_group($name)
	{
	$this->_fetch_groups();
	$result = false;

	$list = array(
	'uid' => kolab_format::generate_uid(),
	'name' => $name,
	'member' => array(),
	);
	$saved = $this->storagefolder->save($list, 'distribution-list');

	if (!$saved) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving distribution-list object to Kolab server"),
	true, false);
	return false;
	}
	else {
	$id = $this->_uid2id($list['uid']);
	$this->distlists[$id] = $list;
	$result = array('id' => $id, 'name' => $name);
	}

	return $result;
	}

	/**
	* Delete the given group and all linked group members
	*
	* @param string Group identifier
	* @return boolean True on success, false if no data was changed
	*/
	function delete_group($gid)
	{
	$this->_fetch_groups();
	$result = false;

	if ($list = $this->distlists[$gid])
	$deleted = $this->storagefolder->delete($list['uid']);

	if (!$deleted) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error deleting distribution-list object from the Kolab server"),
	true, false);
	}
	else
	$result = true;

	return $result;
	}

	/**
	* Rename a specific contact group
	*
	* @param string Group identifier
	* @param string New name to set for this group
	* @return boolean New name on success, false if no data was changed
	*/
	function rename_group($gid, $newname)
	{
	$this->_fetch_groups();
	$list = $this->distlists[$gid];

	if ($newname != $list['name']) {
	$list['name'] = $newname;
	$saved = $this->storagefolder->save($list, 'distribution-list', $list['uid']);
	}

	if (!$saved) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving distribution-list object to Kolab server"),
	true, false);
	return false;
	}

	return $newname;
	}

	/**
	* Add the given contact records the a certain group
	*
	* @param string Group identifier
	* @param array List of contact identifiers to be added
	* @return int Number of contacts added
	*/
	function add_to_group($gid, $ids)
	{
	if (!is_array($ids))
	$ids = explode(',', $ids);

	$added = 0;
	$exists = array();

	$this->_fetch_groups(true);
	$list = $this->distlists[$gid];

	foreach ((array)$list['member'] as $i => $member)
	$exists[] = $member['ID'];

	// substract existing assignments from list
	$ids = array_diff($ids, $exists);

	foreach ($ids as $contact_id) {
	$uid = $this->_id2uid($contact_id);
	if ($contact = $this->storagefolder->get_object($uid)) {
	foreach ($this->get_col_values('email', $contact, true) as $email)
	break;

	$list['member'][] = array(
	'uid' => $uid,
	'email' => $email,
	'name' => $contact['name'],
	);
	$this->groupmembers[$contact_id][] = $gid;
	$added++;
	}
	else if (strpos($uid, 'mailto:') === 0 && ($contact = $this->contacts[$contact_id])) {
	$list['member'][] = array(
	'email' => $contact['email'],
	'name' => $contact['name'],
	);
	$this->groupmembers[$contact_id][] = $gid;
	$added++;
	}
	}

	if ($added)
	$saved = $this->storagefolder->save($list, 'distribution-list', $list['uid']);

	if (!$saved) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving distribution-list to Kolab server"),
	true, false);
	$added = false;
	}
	else {
	$this->distlists[$gid] = $list;
	}

	return $added;
	}

	/**
	* Remove the given contact records from a certain group
	*
	* @param string Group identifier
	* @param array List of contact identifiers to be removed
	* @return int Number of deleted group members
	*/
	function remove_from_group($gid, $ids)
	{
	if (!is_array($ids))
	$ids = explode(',', $ids);

	$this->_fetch_groups();
	if (!($list = $this->distlists[$gid]))
	return false;

	$new_member = array();
	foreach ((array)$list['member'] as $member) {
	if (!in_array($member['ID'], $ids))
	$new_member[] = $member;
	}

	// write distribution list back to server
	$list['member'] = $new_member;
	$saved = $this->storagefolder->save($list, 'distribution-list', $list['uid']);

	if (!$saved) {
	raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving distribution-list object to Kolab server"),
	true, false);
	}
	else {
	// remove group assigments in local cache
	foreach ($ids as $id) {
	$j = array_search($gid, $this->groupmembers[$id]);
	unset($this->groupmembers[$id][$j]);
	}
	$this->distlists[$gid] = $list;
	return true;
	}

	return false;
	}

	/**
	* Check the given data before saving.
	* If input not valid, the message to display can be fetched using get_error()
	*
	* @param array Associative array with contact data to save
	*
	* @return boolean True if input is valid, False if not.
	*/
	public function validate($save_data)
	{
	// validate e-mail addresses
	$valid = parent::validate($save_data);

	// require at least one e-mail address (syntax check is already done)
	if ($valid) {
	if (!strlen($save_data['name'])
	&& !array_filter($this->get_col_values('email', $save_data, true))
	) {
	$this->set_error('warning', 'kolab_addressbook.noemailnamewarning');
	$valid = false;
	}
	}

	return $valid;
	}

	/**
	- * Simply fetch all records and store them in private member vars
	+ * Query storage layer and store records in private member var
	*/
	- private function _fetch_contacts()
	+ private function _fetch_contacts($query = array())
	{
	if (!isset($this->contacts)) {
	$this->contacts = array();
	- foreach ((array)$this->storagefolder->get_objects() as $record) {
	- // Because of a bug, sometimes group records are returned
	- if ($record['__type'] == 'Group')
	- continue;
	-
	+ foreach ((array)$this->storagefolder->select($query) as $record) {
	$contact = $this->_to_rcube_contact($record);
	$id = $contact['ID'];
	$this->contacts[$id] = $contact;
	}
	}
	}

	/**
	* Callback function for sorting contacts
	*/
	private function _sort_contacts_comp($a, $b)
	{
	$a_value = $b_value = '';

	switch ($this->sort_col) {
	case 'name':
	$a_value = $a['name'] . $a['prefix'];
	$b_value = $b['name'] . $b['prefix'];
	case 'firstname':
	$a_value .= $a['firstname'] . $a['middlename'] . $a['surname'];
	$b_value .= $b['firstname'] . $b['middlename'] . $b['surname'];
	break;

	case 'surname':
	$a_value = $a['surname'] . $a['firstname'] . $a['middlename'];
	$b_value = $b['surname'] . $b['firstname'] . $b['middlename'];
	break;

	default:
	$a_value = $a[$this->sort_col];
	$b_value = $b[$this->sort_col];
	break;
	}

	$a_value .= is_array($a['email']) ? $a['email'][0] : $a['email'];
	$b_value .= is_array($b['email']) ? $b['email'][0] : $b['email'];

	// return strcasecmp($a_value, $b_value);
	// make sorting unicode-safe and locale-dependent
	if ($a_value == $b_value)
	return 0;

	$arr = array($a_value, $b_value);
	sort($arr, SORT_LOCALE_STRING);
	return $a_value == $arr[0] ? -1 : 1;
	}

	/**
	* Read distribution-lists AKA groups from server
	*/
	private function _fetch_groups($with_contacts = false)
	{
	if (!isset($this->distlists)) {
	$this->distlists = $this->groupmembers = array();
	foreach ((array)$this->storagefolder->get_objects('distribution-list') as $record) {
	$record['ID'] = $this->_uid2id($record['uid']);
	foreach ((array)$record['member'] as $i => $member) {
	$mid = $this->_uid2id($member['uid'] ? $member['uid'] : 'mailto:' . $member['email']);
	$record['member'][$i]['ID'] = $mid;
	$record['member'][$i]['readonly'] = empty($member['uid']);
	$this->groupmembers[$mid][] = $record['ID'];

	if ($with_contacts && empty($member['uid']))
	$this->contacts[$mid] = $record['member'][$i];
	}
	$this->distlists[$record['ID']] = $record;
	}
	}
	}

	/**
	* Encode object UID into a safe identifier
	*/
	private function _uid2id($uid)
	{
	return rtrim(strtr(base64_encode($uid), '+/', '-_'), '=');
	}

	/**
	* Convert Roundcube object identifier back into the original UID
	*/
	private function _id2uid($id)
	{
	return base64_decode(str_pad(strtr($id, '-_', '+/'), strlen($id) % 4, '=', STR_PAD_RIGHT));
	}

	/**
	* Map fields from internal Kolab_Format to Roundcube contact format
	*/
	private function _to_rcube_contact($record)
	{
	$record['ID'] = $this->_uid2id($record['uid']);

	if (is_array($record['phone'])) {
	$phones = $record['phone'];
	unset($record['phone']);
	foreach ((array)$phones as $i => $phone) {
	$key = 'phone' . ($phone['type'] ? ':' . $phone['type'] : '');
	$record[$key][] = $phone['number'];
	}
	}

	if (is_array($record['website'])) {
	$urls = $record['website'];
	unset($record['website']);
	foreach ((array)$urls as $i => $url) {
	$key = 'website' . ($url['type'] ? ':' . $url['type'] : '');
	$record[$key][] = $url['url'];
	}
	}

	if (is_array($record['address'])) {
	$addresses = $record['address'];
	unset($record['address']);
	foreach ($addresses as $i => $adr) {
	$key = 'address' . ($adr['type'] ? ':' . $adr['type'] : '');
	$record[$key][] = array(
	'street' => $adr['street'],
	'locality' => $adr['locality'],
	'zipcode' => $adr['code'],
	'region' => $adr['region'],
	'country' => $adr['country'],
	);
	}
	}

	// photo is stored as separate attachment
	if ($record['photo'] && strlen($record['photo']) < 255 && ($att = $record['_attachments'][$record['photo']])) {
	// only fetch photo content if requested
	if ($this->action == 'photo')
	$record['photo'] = $att['content'] ? $att['content'] : $this->storagefolder->get_attachment($record['uid'], $att['id']);
	}

	// truncate publickey value for display
	if ($record['pgppublickey'] && $this->action == 'show')
	$record['pgppublickey'] = substr($record['pgppublickey'], 0, 140) . '...';

	// remove empty fields
	return array_filter($record);
	}

	/**
	* Map fields from Roundcube format to internal kolab_format_contact properties
	*/
	private function _from_rcube_contact($contact, $old = array())
	{
	if (!$contact['uid'] && $contact['ID'])
	$contact['uid'] = $this->_id2uid($contact['ID']);
	else if (!$contact['uid'] && $old['uid'])
	$contact['uid'] = $old['uid'];

	$contact['email'] = array_filter($this->get_col_values('email', $contact, true));
	$contact['im'] = array_filter($this->get_col_values('im', $contact, true));

	foreach ($this->get_col_values('website', $contact) as $type => $values) {
	foreach ((array)$values as $url) {
	if (!empty($url)) {
	$contact['website'][] = array('url' => $url, 'type' => $type);
	}
	}
	unset($contact['website:'.$type]);
	}

	foreach ($this->get_col_values('phone', $contact) as $type => $values) {
	foreach ((array)$values as $phone) {
	if (!empty($phone)) {
	$contact['phone'][] = array('number' => $phone, 'type' => $type);
	}
	}
	unset($contact['phone:'.$type]);
	}

	$addresses = array();
	foreach ($this->get_col_values('address', $contact) as $type => $values) {
	foreach ((array)$values as $adr) {
	// skip empty address
	$adr = array_filter($adr);
	if (empty($adr))
	continue;

	$addresses[] = array(
	'type' => $type,
	'street' => $adr['street'],
	'locality' => $adr['locality'],
	'code' => $adr['zipcode'],
	'region' => $adr['region'],
	'country' => $adr['country'],
	);
	}

	unset($contact['address:'.$type]);
	}
	$contact['address'] = $addresses;

	// copy meta data (starting with _) from old object
	foreach ((array)$old as $key => $val) {
	if (!isset($contact[$key]) && $key[0] == '_')
	$contact[$key] = $val;
	}

	// add empty values for some fields which can be removed in the UI
	return array_filter($contact) + array('nickname' => '', 'birthday' => '', 'anniversary' => '', 'freebusyurl' => '');
	}

	}
	diff --git a/plugins/libkolab/SQL/mysql.sql b/plugins/libkolab/SQL/mysql.sql
	index 5f49e92c..55d0dbc9 100644
	--- a/plugins/libkolab/SQL/mysql.sql
	+++ b/plugins/libkolab/SQL/mysql.sql
	@@ -1,20 +1,22 @@
	/**
	* libkolab database schema
	*
	* @version @package_version@
	* @author Thomas Bruederli
	* @licence GNU AGPL
	**/

	CREATE TABLE IF NOT EXISTS `kolab_cache` (
	`resource` VARCHAR(255) CHARACTER SET ascii NOT NULL,
	`type` VARCHAR(32) CHARACTER SET ascii NOT NULL,
	`msguid` BIGINT UNSIGNED NOT NULL,
	`uid` VARCHAR(128) CHARACTER SET ascii NOT NULL,
	+ `created` DATETIME DEFAULT NULL,
	`data` TEXT NOT NULL,
	`xml` TEXT NOT NULL,
	`dtstart` DATETIME,
	`dtend` DATETIME,
	`tags` VARCHAR(255) NOT NULL,
	+ `words` TEXT NOT NULL,
	PRIMARY KEY(`resource`,`type`,`msguid`)
	) /!40000 ENGINE=INNODB / /!40101 CHARACTER SET utf8 COLLATE utf8_general_ci /;
	diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
	index 646f6ca7..1f20e3e1 100644
	--- a/plugins/libkolab/lib/kolab_format_contact.php
	+++ b/plugins/libkolab/lib/kolab_format_contact.php
	@@ -1,531 +1,531 @@
	<?php

	/**
	* Kolab Contact model class
	*
	* @version @package_version@
	* @author Thomas Bruederli <bruederli@kolabsys.com>
	*
	* Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Affero General Public License as
	* published by the Free Software Foundation, either version 3 of the
	* License, or (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Affero General Public License for more details.
	*
	* You should have received a copy of the GNU Affero General Public License
	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	*/

	class kolab_format_contact extends kolab_format
	{
	public $CTYPE = 'application/vcard+xml';

	public static $fulltext_cols = array('name', 'firstname', 'surname', 'middlename', 'email');

	public $phonetypes = array(
	'home' => Telephone::Home,
	'work' => Telephone::Work,
	'text' => Telephone::Text,
	'main' => Telephone::Voice,
	'homefax' => Telephone::Fax,
	'workfax' => Telephone::Fax,
	'mobile' => Telephone::Cell,
	'video' => Telephone::Video,
	'pager' => Telephone::Pager,
	'car' => Telephone::Car,
	'other' => Telephone::Textphone,
	);

	public $addresstypes = array(
	'home' => Address::Home,
	'work' => Address::Work,
	'office' => 0,
	);

	private $gendermap = array(
	'female' => Contact::Female,
	'male' => Contact::Male,
	);

	private $relatedmap = array(
	'manager' => Related::Manager,
	'assistant' => Related::Assistant,
	'spouse' => Related::Spouse,
	'children' => Related::Child,
	);

	// old Kolab 2 format field map
	private $kolab2_fieldmap = array(
	// kolab => roundcube
	'full-name' => 'name',
	'given-name' => 'firstname',
	'middle-names' => 'middlename',
	'last-name' => 'surname',
	'prefix' => 'prefix',
	'suffix' => 'suffix',
	'nick-name' => 'nickname',
	'organization' => 'organization',
	'department' => 'department',
	'job-title' => 'jobtitle',
	'birthday' => 'birthday',
	'anniversary' => 'anniversary',
	'phone' => 'phone',
	'im-address' => 'im',
	'web-page' => 'website',
	'profession' => 'profession',
	'manager-name' => 'manager',
	'assistant' => 'assistant',
	'spouse-name' => 'spouse',
	'children' => 'children',
	'body' => 'notes',
	'pgp-publickey' => 'pgppublickey',
	'free-busy-url' => 'freebusyurl',
	'picture' => 'photo',
	);
	private $kolab2_phonetypes = array(
	'home1' => 'home',
	'business1' => 'work',
	'business2' => 'work',
	'businessfax' => 'workfax',
	);
	private $kolab2_addresstypes = array(
	'business' => 'work'
	);
	private $kolab2_gender = array(0 => 'male', 1 => 'female');


	/**
	* Default constructor
	*/
	function __construct($xmldata = null)
	{
	$this->obj = new Contact;
	$this->xmldata = $xmldata;

	// complete phone types
	$this->phonetypes['homefax'] \|= Telephone::Home;
	$this->phonetypes['workfax'] \|= Telephone::Work;
	}

	/**
	* Load Contact object data from the given XML block
	*
	* @param string XML data
	*/
	public function load($xml)
	{
	$this->obj = kolabformat::readContact($xml, false);
	$this->loaded = true;
	}

	/**
	* Write Contact object data to XML format
	*
	* @return string XML data
	*/
	public function write()
	{
	$this->init();

	if ($this->obj->isValid()) {
	$this->xmldata = kolabformat::writeContact($this->obj);
	parent::update_uid();
	}

	return $this->xmldata;
	}

	/**
	* Set contact properties to the kolabformat object
	*
	* @param array Contact data as hash array
	*/
	public function set(&$object)
	{
	$this->init();

	// set some automatic values if missing
	if (false && !$this->obj->created()) {
	if (!empty($object['created']))
	$object['created'] = new DateTime('now', self::$timezone);
	$this->obj->setCreated(self::get_datetime($object['created']));
	}

	if (!empty($object['uid']))
	$this->obj->setUid($object['uid']);

	// do the hard work of setting object values
	$nc = new NameComponents;
	$nc->setSurnames(self::array2vector($object['surname']));
	$nc->setGiven(self::array2vector($object['firstname']));
	$nc->setAdditional(self::array2vector($object['middlename']));
	$nc->setPrefixes(self::array2vector($object['prefix']));
	$nc->setSuffixes(self::array2vector($object['suffix']));
	$this->obj->setNameComponents($nc);
	$this->obj->setName($object['name']);

	if (isset($object['nickname']))
	$this->obj->setNickNames(self::array2vector($object['nickname']));
	if (isset($object['profession']))
	$this->obj->setTitles(self::array2vector($object['profession']));

	// organisation related properties (affiliation)
	$org = new Affiliation;
	$offices = new vectoraddress;
	if ($object['organization'])
	$org->setOrganisation($object['organization']);
	if ($object['department'])
	$org->setOrganisationalUnits(self::array2vector($object['department']));
	if ($object['jobtitle'])
	$org->setRoles(self::array2vector($object['jobtitle']));

	$rels = new vectorrelated;
	if ($object['manager']) {
	foreach ((array)$object['manager'] as $manager)
	$rels->push(new Related(Related::Text, $manager, Related::Manager));
	}
	if ($object['assistant']) {
	foreach ((array)$object['assistant'] as $assistant)
	$rels->push(new Related(Related::Text, $assistant, Related::Assistant));
	}
	$org->setRelateds($rels);

	// email, im, url
	$this->obj->setEmailAddresses(self::array2vector($object['email']));
	$this->obj->setIMaddresses(self::array2vector($object['im']));

	$vurls = new vectorurl;
	foreach ((array)$object['website'] as $url) {
	$type = $url['type'] == 'blog' ? Url::Blog : Url::None;
	$vurls->push(new Url($url['url'], $type));
	}
	$this->obj->setUrls($vurls);

	// addresses
	$adrs = new vectoraddress;
	foreach ((array)$object['address'] as $address) {
	$adr = new Address;
	$type = $this->addresstypes[$address['type']];
	if (isset($type))
	$adr->setTypes($type);
	else if ($address['type'])
	$adr->setLabel($address['type']);
	if ($address['street'])
	$adr->setStreet($address['street']);
	if ($address['locality'])
	$adr->setLocality($address['locality']);
	if ($address['code'])
	$adr->setCode($address['code']);
	if ($address['region'])
	$adr->setRegion($address['region']);
	if ($address['country'])
	$adr->setCountry($address['country']);

	if ($address['type'] == 'office')
	$offices->push($adr);
	else
	$adrs->push($adr);
	}
	$this->obj->setAddresses($adrs);
	$org->setAddresses($offices);

	// add org affiliation after addresses are set
	$orgs = new vectoraffiliation;
	$orgs->push($org);
	$this->obj->setAffiliations($orgs);

	// telephones
	$tels = new vectortelephone;
	foreach ((array)$object['phone'] as $phone) {
	$tel = new Telephone;
	if (isset($this->phonetypes[$phone['type']]))
	$tel->setTypes($this->phonetypes[$phone['type']]);
	$tel->setNumber($phone['number']);
	$tels->push($tel);
	}
	$this->obj->setTelephones($tels);

	if (isset($object['gender']))
	$this->obj->setGender($this->gendermap[$object['gender']] ? $this->gendermap[$object['gender']] : Contact::NotSet);
	if (isset($object['notes']))
	$this->obj->setNote($object['notes']);
	if (isset($object['freebusyurl']))
	$this->obj->setFreeBusyUrl($object['freebusyurl']);
	if (isset($object['birthday']))
	$this->obj->setBDay(self::get_datetime($object['birthday'], null, true));
	if (isset($object['anniversary']))
	$this->obj->setAnniversary(self::get_datetime($object['anniversary'], null, true));

	if (!empty($object['photo'])) {
	if ($type = rc_image_content_type($object['photo']))
	$this->obj->setPhoto($object['photo'], $type);
	}
	else if (isset($object['photo']))
	$this->obj->setPhoto('','');
	else if ($this->obj->photoMimetype()) // load saved photo for caching
	$object['photo'] = $this->obj->photo();

	// spouse and children are relateds
	$rels = new vectorrelated;
	if ($object['spouse']) {
	$rels->push(new Related(Related::Text, $object['spouse'], Related::Spouse));
	}
	if ($object['children']) {
	foreach ((array)$object['children'] as $child)
	$rels->push(new Related(Related::Text, $child, Related::Child));
	}
	$this->obj->setRelateds($rels);

	// insert/replace crypto keys
	$pgp_index = $pkcs7_index = -1;
	$keys = $this->obj->keys();
	for ($i=0; $i < $keys->size(); $i++) {
	$key = $keys->get($i);
	if ($pgp_index < 0 && $key->type() == Key::PGP)
	$pgp_index = $i;
	else if ($pkcs7_index < 0 && $key->type() == Key::PKCS7_MIME)
	$pkcs7_index = $i;
	}

	$pgpkey = $object['pgppublickey'] ? new Key($object['pgppublickey'], Key::PGP) : new Key();
	$pkcs7key = $object['pkcs7publickey'] ? new Key($object['pkcs7publickey'], Key::PKCS7_MIME) : new Key();

	if ($pgp_index >= 0)
	$keys->set($pgp_index, $pgpkey);
	else if (!empty($object['pgppublickey']))
	$keys->push($pgpkey);
	if ($pkcs7_index >= 0)
	$keys->set($pkcs7_index, $pkcs7key);
	else if (!empty($object['pkcs7publickey']))
	$keys->push($pkcs7key);

	$this->obj->setKeys($keys);

	// TODO: handle language, gpslocation, etc.


	// cache this data
	$this->data = $object;
	unset($this->data['_formatobj']);
	}

	/**
	*
	*/
	public function is_valid()
	{
	return $this->data \|\| (is_object($this->obj) && $this->obj->uid() /$this->obj->isValid()/);
	}

	/**
	* Convert the Contact object into a hash array data structure
	*
	* @return array Contact data as hash array
	*/
	public function to_array()
	{
	// return cached result
	if (!empty($this->data))
	return $this->data;

	$this->init();

	// read object properties into local data object
	$object = array(
	'uid' => $this->obj->uid(),
	# 'changed' => $this->obj->lastModified(),
	'name' => $this->obj->name(),
	);

	$nc = $this->obj->nameComponents();
	$object['surname'] = join(' ', self::vector2array($nc->surnames()));
	$object['firstname'] = join(' ', self::vector2array($nc->given()));
	$object['middlename'] = join(' ', self::vector2array($nc->additional()));
	$object['prefix'] = join(' ', self::vector2array($nc->prefixes()));
	$object['suffix'] = join(' ', self::vector2array($nc->suffixes()));
	$object['nickname'] = join(' ', self::vector2array($this->obj->nickNames()));
	$object['profession'] = join(' ', self::vector2array($this->obj->titles()));

	// organisation related properties (affiliation)
	$orgs = $this->obj->affiliations();
	if ($orgs->size()) {
	$org = $orgs->get(0);
	$object['organization'] = $org->organisation();
	$object['jobtitle'] = join(' ', self::vector2array($org->roles()));
	$object['department'] = join(' ', self::vector2array($org->organisationalUnits()));
	$this->read_relateds($org->relateds(), $object);
	}

	$object['email'] = self::vector2array($this->obj->emailAddresses());
	$object['im'] = self::vector2array($this->obj->imAddresses());

	$urls = $this->obj->urls();
	for ($i=0; $i < $urls->size(); $i++) {
	$url = $urls->get($i);
	$subtype = $url->type() == Url::Blog ? 'blog' : 'homepage';
	$object['website'][] = array('url' => $url->url(), 'type' => $subtype);
	}

	// addresses
	$this->read_addresses($this->obj->addresses(), $object);
	if ($org && ($offices = $org->addresses()))
	$this->read_addresses($offices, $object, 'office');

	// telehones
	$tels = $this->obj->telephones();
	$teltypes = array_flip($this->phonetypes);
	for ($i=0; $i < $tels->size(); $i++) {
	$tel = $tels->get($i);
	$object['phone'][] = array('number' => $tel->number(), 'type' => $teltypes[$tel->types()]);
	}

	$object['notes'] = $this->obj->note();
	$object['freebusyurl'] = $this->obj->freeBusyUrl();

	if ($bday = self::php_datetime($this->obj->bDay()))
	$object['birthday'] = $bday->format('c');

	if ($anniversary = self::php_datetime($this->obj->anniversary()))
	$object['anniversary'] = $anniversary->format('c');

	$gendermap = array_flip($this->gendermap);
	if (($g = $this->obj->gender()) && $gendermap[$g])
	$object['gender'] = $gendermap[$g];

	if ($this->obj->photoMimetype())
	$object['photo'] = $this->obj->photo();

	// relateds -> spouse, children
	$this->read_relateds($this->obj->relateds(), $object);

	// crypto settings: currently only key values are supported
	$keys = $this->obj->keys();
	for ($i=0; is_object($keys) && $i < $keys->size(); $i++) {
	$key = $keys->get($i);
	if ($key->type() == Key::PGP)
	$object['pgppublickey'] = $key->key();
	else if ($key->type() == Key::PKCS7_MIME)
	$object['pkcs7publickey'] = $key->key();
	}

	$this->data = $object;
	return $this->data;
	}

	/**
	* Callback for kolab_storage_cache to get words to index for fulltext search
	*
	* @return array List of words to save in cache
	*/
	public function get_words()
	{
	$data = '';
	foreach (self::$fulltext_cols as $col) {
	- $val = is_array($this->data[$col]) ? join(" ", $this->data[$col]) : $this->data[$col];
	+ $val = is_array($this->data[$col]) ? join(' ', $this->data[$col]) : $this->data[$col];
	if (strlen($val))
	$data .= $val . ' ';
	}

	return array_unique(rcube_utils::normalize_string($data, true));
	}

	/**
	* Load data from old Kolab2 format
	*
	* @param array Hash array with object properties
	*/
	public function fromkolab2($record)
	{
	$object = array(
	'uid' => $record['uid'],
	'email' => array(),
	'phone' => array(),
	);

	foreach ($this->kolab2_fieldmap as $kolab => $rcube) {
	if (is_array($record[$kolab]) \|\| strlen($record[$kolab]))
	$object[$rcube] = $record[$kolab];
	}

	if (isset($record['gender']))
	$object['gender'] = $this->kolab2_gender[$record['gender']];

	foreach ((array)$record['email'] as $i => $email)
	$object['email'][] = $email['smtp-address'];

	if (!$record['email'] && $record['emails'])
	$object['email'] = preg_split('/,\s*/', $record['emails']);

	if (is_array($record['address'])) {
	foreach ($record['address'] as $i => $adr) {
	$object['address'][] = array(
	'type' => $this->kolab2_addresstypes[$adr['type']] ? $this->kolab2_addresstypes[$adr['type']] : $adr['type'],
	'street' => $adr['street'],
	'locality' => $adr['locality'],
	'code' => $adr['postal-code'],
	'region' => $adr['region'],
	'country' => $adr['country'],
	);
	}
	}

	// office location goes into an address block
	if ($record['office-location'])
	$object['address'][] = array('type' => 'office', 'locality' => $record['office-location']);

	// merge initials into nickname
	if ($record['initials'])
	$object['nickname'] = trim($object['nickname'] . ', ' . $record['initials'], ', ');

	// remove empty fields
	$this->data = array_filter($object);
	}

	/**
	* Helper method to copy contents of an Address vector to the contact data object
	*/
	private function read_addresses($addresses, &$object, $type = null)
	{
	$adrtypes = array_flip($this->addresstypes);

	for ($i=0; $i < $addresses->size(); $i++) {
	$adr = $addresses->get($i);
	$object['address'][] = array(
	'type' => $type ? $type : ($adrtypes[$adr->types()] ? $adrtypes[$adr->types()] : ''), /$adr->label()),/
	'street' => $adr->street(),
	'code' => $adr->code(),
	'locality' => $adr->locality(),
	'region' => $adr->region(),
	'country' => $adr->country()
	);
	}
	}

	/**
	* Helper method to map contents of a Related vector to the contact data object
	*/
	private function read_relateds($rels, &$object)
	{
	$typemap = array_flip($this->relatedmap);

	for ($i=0; $i < $rels->size(); $i++) {
	$rel = $rels->get($i);
	if ($rel->type() != Related::Text) // we can't handle UID relations yet
	continue;

	$types = $rel->relationTypes();
	foreach ($typemap as $t => $field) {
	if ($types & $t) {
	$object[$field][] = $rel->text();
	break;
	}
	}
	}
	}
	}
	diff --git a/plugins/libkolab/lib/kolab_storage_cache.php b/plugins/libkolab/lib/kolab_storage_cache.php
	index 72373e1f..7978411f 100644
	--- a/plugins/libkolab/lib/kolab_storage_cache.php
	+++ b/plugins/libkolab/lib/kolab_storage_cache.php
	@@ -1,562 +1,562 @@
	<?php

	/**
	* Kolab storage cache class providing a local caching layer for Kolab groupware objects.
	*
	* @version @package_version@
	* @author Thomas Bruederli <bruederli@kolabsys.com>
	*
	* Copyright (C) 2012, Kolab Systems AG <contact@kolabsys.com>
	*
	* This program is free software: you can redistribute it and/or modify
	* it under the terms of the GNU Affero General Public License as
	* published by the Free Software Foundation, either version 3 of the
	* License, or (at your option) any later version.
	*
	* This program is distributed in the hope that it will be useful,
	* but WITHOUT ANY WARRANTY; without even the implied warranty of
	* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
	* GNU Affero General Public License for more details.
	*
	* You should have received a copy of the GNU Affero General Public License
	* along with this program. If not, see <http://www.gnu.org/licenses/>.
	*/

	class kolab_storage_cache
	{
	private $db;
	private $imap;
	private $folder;
	private $uid2msg;
	private $objects;
	private $resource_uri;
	private $enabled = true;
	private $synched = false;
	private $ready = false;

	private $binary_cols = array('photo','pgppublickey','pkcs7publickey');


	/**
	* Default constructor
	*/
	public function __construct(kolab_storage_folder $storage_folder = null)
	{
	$rcmail = rcube::get_instance();
	$this->db = $rcmail->get_dbh();
	$this->imap = $rcmail->get_storage();
	$this->enabled = $rcmail->config->get('kolab_cache', false);

	if ($storage_folder)
	$this->set_folder($storage_folder);
	}


	/**
	* Connect cache with a storage folder
	*
	* @param kolab_storage_folder The storage folder instance to connect with
	*/
	public function set_folder(kolab_storage_folder $storage_folder)
	{
	$this->folder = $storage_folder;

	if (empty($this->folder->name)) {
	$this->ready = false;
	return;
	}

	// compose fully qualified ressource uri for this instance
	$this->resource_uri = $this->folder->get_resource_uri();
	$this->ready = $this->enabled;
	}


	/**
	* Synchronize local cache data with remote
	*/
	public function synchronize()
	{
	// only sync once per request cycle
	if ($this->synched)
	return;

	// lock synchronization for this folder or wait if locked
	if (!$this->_sync_lock())
	return;

	// synchronize IMAP mailbox cache
	$this->imap->folder_sync($this->folder->name);

	// compare IMAP index with object cache index
	$imap_index = $this->imap->index($this->folder->name);
	$this->index = $imap_index->get();

	// determine objects to fetch or to invalidate
	if ($this->ready) {
	// read cache index
	$sql_result = $this->db->query(
	"SELECT msguid, uid FROM kolab_cache WHERE resource=? AND type<>?",
	$this->resource_uri,
	'lock'
	);

	$old_index = array();
	while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
	$old_index[] = $sql_arr['msguid'];
	$this->uid2msg[$sql_arr['uid']] = $sql_arr['msguid'];
	}

	// fetch new objects from imap
	$fetch_index = array_diff($this->index, $old_index);
	foreach ($this->_fetch($fetch_index, '*') as $object) {
	$msguid = $object['_msguid'];
	$this->set($msguid, $object);
	}

	// delete invalid entries from local DB
	$del_index = array_diff($old_index, $this->index);
	if (!empty($del_index)) {
	$quoted_ids = join(',', array_map(array($this->db, 'quote'), $del_index));
	$this->db->query(
	"DELETE FROM kolab_cache WHERE resource=? AND msguid IN ($quoted_ids)",
	$this->resource_uri
	);
	}
	}

	// remove lock
	$this->_sync_unlock();

	$this->synched = time();
	}


	/**
	* Read a single entry from cache or
	*
	* @param string Related IMAP message UID
	* @param string Object type to read
	* @param string IMAP folder name the entry relates to
	* @param array Hash array with object properties or null if not found
	*/
	public function get($msguid, $type = null, $foldername = null)
	{
	// delegate to another cache instance
	if ($foldername && $foldername != $this->folder->name) {
	return kolab_storage::get_folder($foldername)->cache->get($msguid, $object);
	}

	// load object if not in memory
	if (!isset($this->objects[$msguid])) {
	if ($this->ready) {
	$sql_result = $this->db->query(
	"SELECT * FROM kolab_cache ".
	"WHERE resource=? AND msguid=?",
	$this->resource_uri,
	$msguid
	);

	if ($sql_arr = $this->db->fetch_assoc($sql_result)) {
	$this->objects[$msguid] = $this->_unserialize($sql_arr);
	}
	}

	// fetch from IMAP if not present in cache
	if (empty($this->objects[$msguid])) {
	$result = $this->_fetch(array($msguid), $type, $foldername);
	$this->objects[$msguid] = $result[0];
	}
	}

	return $this->objects[$msguid];
	}


	/**
	* Insert/Update a cache entry
	*
	* @param string Related IMAP message UID
	* @param mixed Hash array with object properties to save or false to delete the cache entry
	* @param string IMAP folder name the entry relates to
	*/
	public function set($msguid, $object, $foldername = null)
	{
	// delegate to another cache instance
	if ($foldername && $foldername != $this->folder->name) {
	kolab_storage::get_folder($foldername)->cache->set($msguid, $object);
	return;
	}

	// write to cache
	if ($this->ready) {
	// remove old entry
	$this->db->query("DELETE FROM kolab_cache WHERE resource=? AND msguid=?",
	$this->resource_uri, $msguid);

	// write new object data if not false (wich means deleted)
	if ($object) {
	$sql_data = $this->_serialize($object);
	$objtype = $object['_type'] ? $object['_type'] : $this->folder->type;

	$result = $this->db->query(
	"INSERT INTO kolab_cache ".
	" (resource, type, msguid, uid, data, xml, dtstart, dtend, tags, words)".
	" VALUES (?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
	$this->resource_uri,
	$objtype,
	$msguid,
	$object['uid'],
	$sql_data['data'],
	$sql_data['xml'],
	$sql_data['dtstart'],
	$sql_data['dtend'],
	$sql_data['tags'],
	$sql_data['words']
	);

	if (!$this->db->affected_rows($result)) {
	rcmail::raise_error(array(
	'code' => 900, 'type' => 'php',
	'message' => "Failed to write to kolab cache"
	), true);
	}
	}
	}

	// keep a copy in memory for fast access
	$this->objects[$msguid] = $object;

	if ($object)
	$this->uid2msg[$object['uid']] = $msguid;
	}

	/**
	* Move an existing cache entry to a new resource
	*
	* @param string Entry's IMAP message UID
	* @param string Entry's Object UID
	* @param string Target IMAP folder to move it to
	*/
	public function move($msguid, $objuid, $target_folder)
	{
	$target = kolab_storage::get_folder($target_folder);

	// resolve new message UID in target folder
	if ($new_msguid = $target->cache->uid2msguid($objuid)) {
	$this->db->query(
	"UPDATE kolab_cache SET resource=?, msguid=? ".
	"WHERE resource=? AND msguid=?",
	$target->get_resource_uri(),
	$new_msguid,
	$this->resource_uri,
	$msguid
	);
	}
	else {
	// just clear cache entry
	$this->set($msguid, false);
	}

	unset($this->uid2msg[$uid]);
	}


	/**
	* Remove all objects from local cache
	*/
	public function purge($type = null)
	{
	$result = $this->db->query(
	"DELETE FROM kolab_cache WHERE resource=?".
	($type ? ' AND type=?' : ''),
	$this->resource_uri,
	$type
	);
	return $this->db->affected_rows($result);
	}


	/**
	* Select Kolab objects filtered by the given query
	*
	* @param array Pseudo-SQL query as list of filter parameter triplets
	* triplet: array('<colname>', '<comparator>', '<value>')
	* @return array List of Kolab data objects (each represented as hash array)
	*/
	public function select($query = array())
	{
	$result = array();

	// read from local cache DB (assume it to be synchronized)
	if ($this->ready) {
	$sql_result = $this->db->query(
	"SELECT * FROM kolab_cache ".
	"WHERE resource=? " . $this->_sql_where($query),
	$this->resource_uri
	);

	while ($sql_arr = $this->db->fetch_assoc($sql_result)) {
	if ($object = $this->_unserialize($sql_arr))
	$result[] = $object;
	}
	}
	else {
	// extract object type from query parameter
	$filter = $this->_query2assoc($query);

	// use 'list' for folder's default objects
	if ($filter['type'] == $this->type && !empty($this->index)) {
	$index = $this->index;
	}
	else { // search by object type
	$search = 'UNDELETED HEADER X-Kolab-Type ' . kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
	$index = $this->imap->search_once($this->folder->name, $search)->get();
	}

	// fetch all messages in $index from IMAP
	$result = $this->_fetch($index, $filter['type']);

	// TODO: post-filter result according to query
	}

	return $result;
	}


	/**
	* Get number of objects mathing the given query
	*
	* @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
	* @return integer The number of objects of the given type
	*/
	public function count($query = array())
	{
	$count = 0;

	// cache is in sync, we can count records in local DB
	if ($this->synched) {
	$sql_result = $this->db->query(
	"SELECT COUNT(*) AS NUMROWS FROM kolab_cache ".
	"WHERE resource=? " . $this->_sql_where($query),
	$this->resource_uri
	);

	$sql_arr = $this->db->fetch_assoc($sql_result);
	$count = intval($sql_arr['NUMROWS']);
	}
	else {
	// search IMAP by object type
	$filter = $this->_query2assoc($query);
	$ctype = kolab_storage_folder::KTYPE_PREFIX . $filter['type'];
	$index = $this->imap->search_once($this->folder->name, 'UNDELETED HEADER X-Kolab-Type ' . $ctype);
	$count = $index->count();
	}

	return $count;
	}


	/**
	* Helper method to compose a valid SQL query from pseudo filter triplets
	*/
	private function _sql_where($query)
	{
	$sql_where = '';
	foreach ($query as $param) {
	- $sql_where .= sprintf(' AND %s%s%s',
	+ $sql_where .= sprintf(' AND %s %s %s',
	$this->db->quote_identifier($param[0]),
	$param[1],
	$this->db->quote($param[2])
	);
	}

	return $sql_where;
	}

	/**
	* Helper method to convert the given pseudo-query triplets into
	* an associative filter array with 'equals' values only
	*/
	private function _query2assoc($query)
	{
	// extract object type from query parameter
	$filter = array();
	foreach ($query as $param) {
	if ($param[1] == '=')
	$filter[$param[0]] = $param[2];
	}
	return $filter;
	}

	/**
	* Fetch messages from IMAP
	*
	* @param array List of message UIDs to fetch
	* @return array List of parsed Kolab objects
	*/
	private function _fetch($index, $type = null, $folder = null)
	{
	$results = array();
	foreach ((array)$index as $msguid) {
	if ($object = $this->folder->read_object($msguid, $type, $folder)) {
	$results[] = $object;
	$this->uid2msg[$object['uid']] = $msguid;
	}
	}

	return $results;
	}


	/**
	* Helper method to convert the given Kolab object into a dataset to be written to cache
	*/
	private function _serialize($object)
	{
	$bincols = array_flip($this->binary_cols);
	$sql_data = array('dtstart' => null, 'dtend' => null, 'xml' => '');

	// set type specific values
	if ($this->folder->type == 'event') {
	// database runs in server's timezone so using date() is what we want
	$sql_data['dtstart'] = date('Y-m-d H:i:s', is_object($object['start']) ? $object['start']->format('U') : $object['start']);
	$sql_data['dtend'] = date('Y-m-d H:i:s', is_object($object['end']) ? $object['end']->format('U') : $object['end']);

	// extend date range for recurring events
	if ($object['recurrence']) {
	$sql_data['dtend'] = date('Y-m-d H:i:s', $object['recurrence']['UNTIL'] ?: strtotime('now + 2 years'));
	}
	}

	if ($object['_formatobj']) {
	$sql_data['xml'] = (string)$object['_formatobj']->write();
	- $sql_data['tags'] = join(' ', $object['_formatobj']->get_tags());
	- $sql_data['words'] = join(' ', $object['_formatobj']->get_words());
	+ $sql_data['tags'] = ' ' . join(' ', $object['_formatobj']->get_tags()) . ' '; // pad with spaces for strict/prefix search
	+ $sql_data['words'] = ' ' . join(' ', $object['_formatobj']->get_words()) . ' ';
	}

	// extract object data
	$data = array();
	foreach ($object as $key => $val) {
	if ($val === "" \|\| $val === null) {
	// skip empty properties
	continue;
	}
	if (isset($bincols[$key])) {
	$data[$key] = base64_encode($val);
	}
	else if ($key[0] != '_') {
	$data[$key] = $val;
	}
	else if ($key == '_attachments') {
	foreach ($val as $k => $att) {
	unset($att['content'], $att['path']);
	if ($att['id'])
	$data[$key][$k] = $att;
	}
	}
	}

	$sql_data['data'] = serialize($data);
	return $sql_data;
	}

	/**
	* Helper method to turn stored cache data into a valid storage object
	*/
	private function _unserialize($sql_arr)
	{
	$object = unserialize($sql_arr['data']);

	// decode binary properties
	foreach ($this->binary_cols as $key) {
	if (!empty($object[$key]))
	$object[$key] = base64_decode($object[$key]);
	}

	// add meta data
	$object['_type'] = $sql_arr['type'];
	$object['_msguid'] = $sql_arr['msguid'];
	$object['_mailbox'] = $this->folder->name;
	$object['_formatobj'] = kolab_format::factory($sql_arr['type'], $sql_arr['xml']);

	return $object;
	}

	/**
	* Check lock record for this folder and wait if locked or set lock
	*/
	private function _sync_lock()
	{
	if (!$this->ready)
	return false;

	$sql_arr = $this->db->fetch_assoc($this->db->query(
	- "SELECT msguid AS locked FROM kolab_cache ".
	+ "SELECT msguid AS locked, ".$this->db->unixtimestamp('created')." AS created FROM kolab_cache ".
	"WHERE resource=? AND type=?",
	$this->resource_uri,
	'lock'
	));

	// create lock record if not exists
	if (!$sql_arr) {
	$this->db->query(
	- "INSERT INTO kolab_cache (resource, type, msguid, uid, data, xml)".
	- " VALUES (?, ?, ?, '', '', '')",
	+ "INSERT INTO kolab_cache (resource, type, msguid, created, uid, data, xml)".
	+ " VALUES (?, ?, 1, ?, '', '', '')",
	$this->resource_uri,
	'lock',
	- time()
	+ date('Y-m-d H:i:s')
	);
	}
	// wait if locked (expire locks after 10 minutes)
	- else if (intval($sql_arr['locked']) > 0 && (time() - $sql_arr['locked']) < 600) {
	+ else if (intval($sql_arr['locked']) > 0 && (time() - $sql_arr['created']) < 600) {
	usleep(500000);
	return $this->_sync_lock();
	}
	// set lock
	else {
	$this->db->query(
	- "UPDATE kolab_cache SET msguid=? ".
	+ "UPDATE kolab_cache SET msguid=1, created=? ".
	"WHERE resource=? AND type=?",
	- time(),
	+ date('Y-m-d H:i:s'),
	$this->resource_uri,
	'lock'
	);
	}

	return true;
	}

	/**
	* Remove lock for this folder
	*/
	private function _sync_unlock()
	{
	$this->db->query(
	- "UPDATE kolab_cache SET msguid=0 ".
	+ "UPDATE kolab_cache SET msguid=0, created='' ".
	"WHERE resource=? AND type=?",
	$this->resource_uri,
	'lock'
	);
	}

	/**
	* Resolve an object UID into an IMAP message UID
	*
	* @param string Kolab object UID
	* @param boolean Include deleted objects
	* @return int The resolved IMAP message UID
	*/
	public function uid2msguid($uid, $deleted = false)
	{
	if (!isset($this->uid2msg[$uid])) {
	// use IMAP SEARCH to get the right message
	$index = $this->imap->search_once($this->folder->name, ($deleted ? '' : 'UNDELETED ') . 'HEADER SUBJECT ' . $uid);
	$results = $index->get();
	$this->uid2msg[$uid] = $results[0];
	}

	return $this->uid2msg[$uid];
	}

	}

File Metadata

Mime Type: text/x-diff
Expires: Mon, Aug 17, 5:10 PM (1 d, 9 h)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 1257426
Default Alt Text: (78 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions