No OneTemporary
Actions

Authored By

Unknown

Size

56 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/libkolab/lib/kolab_format.php b/plugins/libkolab/lib/kolab_format.php
	index c340fcc7..66588975 100644
	--- a/plugins/libkolab/lib/kolab_format.php
	+++ b/plugins/libkolab/lib/kolab_format.php
	@@ -1,310 +1,312 @@
	<?php

	/**
	* Kolab format model class wrapping libkolabxml bindings
	*
	* Abstract base class for different Kolab groupware objects read from/written
	* to the new Kolab 3 format using the PHP bindings of libkolabxml.
	*
	* @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/>.
	*/

	abstract class kolab_format
	{
	public static $timezone;

	public /abstract/ $CTYPE;

	protected /abstract/ $read_func;
	protected /abstract/ $write_func;

	protected $obj;
	protected $data;
	protected $xmldata;
	protected $loaded = false;

	+ const VERSION = '3.0';
	+
	/**
	* Factory method to instantiate a kolab_format object of the given type
	*
	* @param string Object type to instantiate
	* @param string Cached xml data to initialize with
	* @return object kolab_format
	*/
	public static function factory($type, $xmldata = null)
	{
	if (!isset(self::$timezone))
	self::$timezone = new DateTimeZone('UTC');

	$type = preg_replace('/configuration\.[a-z.]+$/', 'configuration', $type);
	$suffix = preg_replace('/[^a-z]+/', '', $type);
	$classname = 'kolab_format_' . $suffix;
	if (class_exists($classname))
	return new $classname($xmldata);

	return PEAR::raiseError("Failed to load Kolab Format wrapper for type " . $type);
	}

	/**
	* Convert the given date/time value into a cDateTime object
	*
	* @param mixed Date/Time value either as unix timestamp, date string or PHP DateTime object
	* @param DateTimeZone The timezone the date/time is in. Use global default if Null, local time if False
	* @param boolean True of the given date has no time component
	* @return object The libkolabxml date/time object
	*/
	public static function get_datetime($datetime, $tz = null, $dateonly = false)
	{
	if (!$tz && $tz !== false) $tz = self::$timezone;
	$result = new cDateTime();

	// got a unix timestamp (in UTC)
	if (is_numeric($datetime)) {
	$datetime = new DateTime('@'.$datetime, new DateTimeZone('UTC'));
	if ($tz) $datetime->setTimezone($tz);
	}
	else if (is_string($datetime) && strlen($datetime))
	$datetime = new DateTime($datetime, $tz ?: null);

	if (is_a($datetime, 'DateTime')) {
	$result->setDate($datetime->format('Y'), $datetime->format('n'), $datetime->format('j'));

	if (!$dateonly)
	$result->setTime($datetime->format('G'), $datetime->format('i'), $datetime->format('s'));

	if ($tz && $tz->getName() == 'UTC')
	$result->setUTC(true);
	else if ($tz !== false)
	$result->setTimezone($tz->getName());
	}

	return $result;
	}

	/**
	* Convert the given cDateTime into a PHP DateTime object
	*
	* @param object cDateTime The libkolabxml datetime object
	* @return object DateTime PHP datetime instance
	*/
	public static function php_datetime($cdt)
	{
	if (!is_object($cdt) \|\| !$cdt->isValid())
	return null;

	$d = new DateTime;
	$d->setTimezone(self::$timezone);

	try {
	if ($tzs = $cdt->timezone()) {
	$tz = new DateTimeZone($tzs);
	$d->setTimezone($tz);
	}
	else if ($cdt->isUTC()) {
	$d->setTimezone(new DateTimeZone('UTC'));
	}
	}
	catch (Exception $e) { }

	$d->setDate($cdt->year(), $cdt->month(), $cdt->day());

	if ($cdt->isDateOnly()) {
	$d->_dateonly = true;
	$d->setTime(12, 0, 0); // set time to noon to avoid timezone troubles
	}
	else {
	$d->setTime($cdt->hour(), $cdt->minute(), $cdt->second());
	}

	return $d;
	}

	/**
	* Convert a libkolabxml vector to a PHP array
	*
	* @param object vector Object
	* @return array Indexed array contaning vector elements
	*/
	public static function vector2array($vec, $max = PHP_INT_MAX)
	{
	$arr = array();
	for ($i=0; $i < $vec->size() && $i < $max; $i++)
	$arr[] = $vec->get($i);
	return $arr;
	}

	/**
	* Build a libkolabxml vector (string) from a PHP array
	*
	* @param array Array with vector elements
	* @return object vectors
	*/
	public static function array2vector($arr)
	{
	$vec = new vectors;
	foreach ((array)$arr as $val) {
	if (strlen($val))
	$vec->push($val);
	}
	return $vec;
	}

	/**
	* Check for format errors after calling kolabformat::write*()
	*
	* @return boolean True if there were errors, False if OK
	*/
	protected function format_errors()
	{
	$ret = $log = false;
	switch (kolabformat::error()) {
	case kolabformat::NoError:
	$ret = false;
	break;
	case kolabformat::Warning:
	$ret = false;
	$log = "Warning";
	break;
	default:
	$ret = true;
	$log = "Error";
	}

	if ($log) {
	rcube::raise_error(array(
	'code' => 660,
	'type' => 'php',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "kolabformat write $log: " . kolabformat::errorMessage(),
	), true);
	}

	return $ret;
	}

	/**
	* Save the last generated UID to the object properties.
	* Should be called after kolabformat::writeXXXX();
	*/
	protected function update_uid()
	{
	// get generated UID
	if (!$this->data['uid']) {
	$this->data['uid'] = kolabformat::getSerializedUID();
	$this->obj->setUid($this->data['uid']);
	}
	}

	/**
	* Initialize libkolabxml object with cached xml data
	*/
	protected function init()
	{
	if (!$this->loaded) {
	if ($this->xmldata) {
	$this->load($this->xmldata);
	$this->xmldata = null;
	}
	$this->loaded = true;
	}
	}

	/**
	* Direct getter for object properties
	*/
	public function __get($var)
	{
	return $this->data[$var];
	}

	/**
	* Load Kolab object data from the given XML block
	*
	* @param string XML data
	*/
	public function load($xml)
	{
	$this->obj = call_user_func($this->read_func, $xml, false);
	$this->loaded = !$this->format_errors();
	}

	/**
	* Write object data to XML format
	*
	* @return string XML data
	*/
	public function write()
	{
	$this->init();
	$this->xmldata = call_user_func($this->write_func, $this->obj);

	if (!$this->format_errors())
	$this->update_uid();
	else
	$this->xmldata = null;

	return $this->xmldata;
	}

	/**
	* Set properties to the kolabformat object
	*
	* @param array Object data as hash array
	*/
	abstract public function set(&$object);

	/**
	*
	*/
	abstract public function is_valid();

	/**
	* Convert the Kolab object into a hash array data structure
	*
	* @return array Kolab object data as hash array
	*/
	abstract public function to_array();

	/**
	* Load object data from Kolab2 format
	*
	* @param array Hash array with object properties (produced by Horde Kolab_Format classes)
	*/
	abstract public function fromkolab2($object);

	/**
	* Callback for kolab_storage_cache to get object specific tags to cache
	*
	* @return array List of tags to save in cache
	*/
	public function get_tags()
	{
	return array();
	}

	/**
	* 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()
	{
	return array();
	}
	}
	diff --git a/plugins/libkolab/lib/kolab_format_contact.php b/plugins/libkolab/lib/kolab_format_contact.php
	index 358e1b1e..84df7420 100644
	--- a/plugins/libkolab/lib/kolab_format_contact.php
	+++ b/plugins/libkolab/lib/kolab_format_contact.php
	@@ -1,506 +1,506 @@
	<?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';

	protected $read_func = 'kolabformat::readContact';
	protected $write_func = 'kolabformat::writeContact';

	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;
	}

	/**
	* 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;
	+ $type = $url['type'] == 'blog' ? Url::Blog : Url::NoType;
	$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'], false, true));
	if (isset($object['anniversary']))
	$this->obj->setAnniversary(self::get_datetime($object['anniversary'], false, 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(),
	'name' => $this->obj->name(),
	'changed' => self::php_datetime($this->obj->lastModified()),
	);

	$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];
	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_folder.php b/plugins/libkolab/lib/kolab_storage_folder.php
	index 22ddfdb1..d2a78de5 100644
	--- a/plugins/libkolab/lib/kolab_storage_folder.php
	+++ b/plugins/libkolab/lib/kolab_storage_folder.php
	@@ -1,767 +1,779 @@
	<?php

	/**
	* The kolab_storage_folder class represents an IMAP folder on the Kolab server.
	*
	* @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_folder
	{
	const KTYPE_PREFIX = 'application/x-vnd.kolab.';

	/**
	* The folder name.
	* @var string
	*/
	public $name;

	/**
	* The type of this folder.
	* @var string
	*/
	public $type;

	/**
	* Is this folder set to be the default for its type
	* @var boolean
	*/
	public $default = false;

	/**
	* Is this folder set to be default
	* @var boolean
	*/
	public $cache;

	private $type_annotation;
	private $imap;
	private $info;
	private $owner;
	private $resource_uri;
	private $uid2msg = array();


	/**
	* Default constructor
	*/
	function __construct($name, $type = null)
	{
	$this->imap = rcube::get_instance()->get_storage();
	$this->imap->set_options(array('skip_deleted' => true));
	$this->cache = new kolab_storage_cache($this);
	$this->set_folder($name, $type);
	}


	/**
	* Set the IMAP folder this instance connects to
	*
	* @param string The folder name/path
	* @param string Optional folder type if known
	*/
	public function set_folder($name, $ftype = null)
	{
	if (!$ftype) {
	$metadata = $this->imap->get_metadata($name, array(kolab_storage::CTYPE_KEY));
	$this->type_annotation = $metadata[$name][kolab_storage::CTYPE_KEY];
	}
	else {
	$this->type_annotation = $ftype;
	}

	list($this->type, $suffix) = explode('.', $this->type_annotation);
	$this->default = $suffix == 'default';
	$this->name = $name;
	$this->resource_uri = null;

	$this->imap->set_folder($this->name);
	$this->cache->set_folder($this);
	}


	/**
	*
	*/
	private function get_folder_info()
	{
	if (!isset($this->info))
	$this->info = $this->imap->folder_info($this->name);

	return $this->info;
	}


	/**
	* Returns IMAP metadata/annotations (GETMETADATA/GETANNOTATION)
	*
	* @param array List of metadata keys to read
	* @return array Metadata entry-value hash array on success, NULL on error
	*/
	public function get_metadata($keys)
	{
	$metadata = $this->imap->get_metadata($this->name, (array)$keys);
	return $metadata[$this->name];
	}


	/**
	* Sets IMAP metadata/annotations (SETMETADATA/SETANNOTATION)
	*
	* @param array $entries Entry-value array (use NULL value as NIL)
	* @return boolean True on success, False on failure
	*/
	public function set_metadata($entries)
	{
	return $this->imap->set_metadata($this->name, $entries);
	}


	/**
	* Returns the owner of the folder.
	*
	* @return string The owner of this folder.
	*/
	public function get_owner()
	{
	// return cached value
	if (isset($this->owner))
	return $this->owner;

	$info = $this->get_folder_info();
	$rcmail = rcube::get_instance();

	switch ($info['namespace']) {
	case 'personal':
	$this->owner = $rcmail->get_user_name();
	break;

	case 'shared':
	$this->owner = 'anonymous';
	break;

	default:
	$owner = '';
	list($prefix, $user) = explode($this->imap->get_hierarchy_delimiter(), $info['name']);
	if (strpos($user, '@') === false) {
	$domain = strstr($rcmail->get_user_name(), '@');
	if (!empty($domain))
	$user .= $domain;
	}
	$this->owner = $user;
	break;
	}

	return $this->owner;
	}


	/**
	* 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()
	{
	return $this->imap->folder_namespace($this->name);
	}


	/**
	* Get IMAP ACL information for this folder
	*
	* @return string Permissions as string
	*/
	public function get_myrights()
	{
	$rights = $this->info['rights'];

	if (!is_array($rights))
	$rights = $this->imap->my_rights($this->name);

	return join('', (array)$rights);
	}


	/**
	* Compose a unique resource URI for this IMAP folder
	*/
	public function get_resource_uri()
	{
	if (!empty($this->resource_uri))
	return $this->resource_uri;

	// strip namespace prefix from folder name
	$ns = $this->get_namespace();
	$nsdata = $this->imap->get_namespace($ns);
	if (is_array($nsdata[0]) && strlen($nsdata[0][0]) && strpos($this->name, $nsdata[0][0]) === 0) {
	$subpath = substr($this->name, strlen($nsdata[0][0]));
	if ($ns == 'other') {
	list($user, $suffix) = explode($nsdata[0][1], $subpath);
	$subpath = $suffix;
	}
	}
	else {
	$subpath = $this->name;
	}

	// compose fully qualified ressource uri for this instance
	$this->resource_uri = 'imap://' . urlencode($this->get_owner()) . '@' . $this->imap->options['host'] . '/' . $subpath;
	return $this->resource_uri;
	}

	/**
	* Check subscription status of this folder
	*
	* @param string Subscription type (kolab_storage::SERVERSIDE_SUBSCRIPTION or kolab_storage::CLIENTSIDE_SUBSCRIPTION)
	* @return boolean True if subscribed, false if not
	*/
	public function is_subscribed($type = 0)
	{
	static $subscribed; // local cache

	if ($type == kolab_storage::SERVERSIDE_SUBSCRIPTION) {
	if (!$subscribed)
	$subscribed = $this->imap->list_folders_subscribed();

	return in_array($this->name, $subscribed);
	}
	else if (kolab_storage::CLIENTSIDE_SUBSCRIPTION) {
	// TODO: implement this
	return true;
	}

	return false;
	}

	/**
	* Change subscription status of this folder
	*
	* @param boolean The desired subscription status: true = subscribed, false = not subscribed
	* @param string Subscription type (kolab_storage::SERVERSIDE_SUBSCRIPTION or kolab_storage::CLIENTSIDE_SUBSCRIPTION)
	* @return True on success, false on error
	*/
	public function subscribe($subscribed, $type = 0)
	{
	if ($type == kolab_storage::SERVERSIDE_SUBSCRIPTION) {
	return $subscribed ? $this->imap->subscribe($this->name) : $this->imap->unsubscribe($this->name);
	}
	else {
	// TODO: implement this
	}

	return false;
	}


	/**
	* Get number of objects stored in this folder
	*
	* @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($type = null)
	{
	if (!$type) $type = $this->type;

	// synchronize cache first
	$this->cache->synchronize();

	return $this->cache->count(array(array('type','=',$type)));
	}


	/**
	* List all Kolab objects of the given type
	*
	* @param string $type Object type (e.g. contact, event, todo, journal, note, configuration)
	* @return array List of Kolab data objects (each represented as hash array)
	*/
	public function get_objects($type = null)
	{
	if (!$type) $type = $this->type;

	// synchronize caches
	$this->cache->synchronize();

	// fetch objects from cache
	return $this->cache->select(array(array('type','=',$type)));
	}


	/**
	* Select some Kolab objects matching 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())
	{
	// check query argument
	if (empty($query))
	return $this->get_objects();

	$type = null;
	foreach ($query as $i => $param) {
	if ($param[0] == 'type') {
	$type = $param[2];
	}
	else if (($param[0] == 'dtstart' \|\| $param[0] == 'dtend') && is_numeric($param[2])) {
	$query[$i][2] = date('Y-m-d H:i:s', $param[2]);
	}
	}

	// add type selector if not in $query
	if (!$type)
	$query[] = array('type','=',$this->type);

	// synchronize caches
	$this->cache->synchronize();

	// fetch objects from cache
	return $this->cache->select($query);
	}


	/**
	* Getter for a single Kolab object, identified by its UID
	*
	* @param string Object UID
	* @return array The Kolab object represented as hash array
	*/
	public function get_object($uid)
	{
	// synchronize caches
	$this->cache->synchronize();

	$msguid = $this->cache->uid2msguid($uid);
	if ($msguid && ($object = $this->cache->get($msguid)))
	return $object;

	return false;
	}


	/**
	* Fetch a Kolab object attachment which is stored in a separate part
	* of the mail MIME message that represents the Kolab record.
	*
	* @param string Object's UID
	* @param string The attachment's mime number
	* @param string IMAP folder where message is stored;
	* If set, that also implies that the given UID is an IMAP UID
	* @return mixed The attachment content as binary string
	*/
	public function get_attachment($uid, $part, $mailbox = null)
	{
	if ($msguid = ($mailbox ? $uid : $this->cache->uid2msguid($uid))) {
	$this->imap->set_folder($mailbox ? $mailbox : $this->name);
	return $this->imap->get_message_part($msguid, $part);
	}

	return null;
	}


	/**
	* Fetch the mime message from the storage server and extract
	* the Kolab groupware object from it
	*
	* @param string The IMAP message UID to fetch
	* @param string The object type expected (use wildcard '*' to accept all types)
	* @param string The folder name where the message is stored
	* @return mixed Hash array representing the Kolab object, a kolab_format instance or false if not found
	*/
	public function read_object($msguid, $type = null, $folder = null)
	{
	if (!$type) $type = $this->type;
	if (!$folder) $folder = $this->name;

	$this->imap->set_folder($folder);

	$headers = $this->imap->get_message_headers($msguid);
	$object_type = preg_replace('/dictionary.[a-z]+$/', 'dictionary', substr($headers->others['x-kolab-type'], strlen(self::KTYPE_PREFIX)));
	$content_type = self::KTYPE_PREFIX . $object_type;

	// check object type header and abort on mismatch
	if ($type != '*' && $object_type != $type)
	return false;

	$message = new rcube_message($msguid);
	$attachments = array();

	// get XML part
	foreach ((array)$message->attachments as $part) {
	if (!$xml && ($part->mimetype == $content_type \|\| preg_match('!application/([a-z]+\+)?xml!', $part->mimetype))) {
	$xml = $part->body ? $part->body : $message->get_part_content($part->mime_id);
	}
	else if ($part->filename \|\| $part->content_id) {
	$key = $part->content_id ? trim($part->content_id, '<>') : $part->filename;
	$attachments[$key] = array(
	'id' => $part->mime_id,
	'mimetype' => $part->mimetype,
	'size' => $part->size,
	);
	}
	}

	if (!$xml) {
	rcube::raise_error(array(
	'code' => 600,
	'type' => 'php',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Could not find Kolab data part in message $msguid ($this->name).",
	), true);
	return false;
	}

	$format = kolab_format::factory($object_type);

	if (is_a($format, 'PEAR_Error'))
	return false;

	// check kolab format version
	- list($xmltype, $subtype) = explode('.', $object_type);
	- if (strpos($xml, '<' . $xmltype) !== false && strpos($xml, 'xmlns=') === false) {
	- // old Kolab 2.0 format detected
	+ $mime_version = $headers->others['x-kolab-mime-version'];
	+ if (empty($mime_version)) {
	+ list($xmltype, $subtype) = explode('.', $object_type);
	+ $xmlhead = substr($xml, 0, 512);
	+
	+ // detect old Kolab 2.0 format
	+ if (strpos($xmlhead, '<' . $xmltype) !== false && strpos($xmlhead, 'xmlns=') === false)
	+ $mime_version = 2.0;
	+ else
	+ $mime_version = 3.0; // assume 3.0
	+ }
	+
	+ if ($mime_version <= 2.0) {
	+ // read Kolab 2.0 format
	$handler = class_exists('Horde_Kolab_Format') ? Horde_Kolab_Format::factory('XML', $xmltype, array('subtype' => $subtype)) : null;
	if (!is_object($handler) \|\| is_a($handler, 'PEAR_Error')) {
	return false;
	}

	// XML-to-array
	$object = $handler->load($xml);
	$format->fromkolab2($object);
	}
	else {
	// load Kolab 3 format using libkolabxml
	$format->load($xml);
	}

	if ($format->is_valid()) {
	$object = $format->to_array();
	$object['_type'] = $object_type;
	$object['_msguid'] = $msguid;
	$object['_mailbox'] = $this->name;
	$object['_attachments'] = array_merge((array)$object['_attachments'], $attachments);
	$object['_formatobj'] = $format;

	return $object;
	}
	else {
	// try to extract object UID from XML block
	if (preg_match('!<uid>(.+)</uid>!Uims', $xml, $m))
	$msgadd = " UID = " . trim(strip_tags($m[1]));

	rcube::raise_error(array(
	'code' => 600,
	'type' => 'php',
	'file' => __FILE__,
	'line' => __LINE__,
	'message' => "Could not parse Kolab object data in message $msguid ($this->name)." . $msgadd,
	), true);
	}

	return false;
	}


	/**
	* Save an object in this folder.
	*
	* @param array $object The array that holds the data of the object.
	* @param string $type The type of the kolab object.
	* @param string $uid The UID of the old object if it existed before
	* @return boolean True on success, false on error
	*/
	public function save(&$object, $type = null, $uid = null)
	{
	if (!$type)
	$type = $this->type;

	// copy attachments from old message
	if (!empty($object['_msguid']) && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox']))) {
	foreach ((array)$old['_attachments'] as $name => $att) {
	if (!isset($object['_attachments'][$name])) {
	$object['_attachments'][$name] = $old['_attachments'][$name];
	}
	// load photo.attachment from old Kolab2 format to be directly embedded in xcard block
	if ($name == 'photo.attachment' && !isset($object['photo']) && !$object['_attachments'][$name]['content'] && $att['id']) {
	$object['photo'] = $this->get_attachment($object['_msguid'], $att['id'], $object['_mailbox']);
	unset($object['_attachments'][$name]);
	}
	}
	}

	if ($raw_msg = $this->build_message($object, $type)) {
	$result = $this->imap->save_message($this->name, $raw_msg, '', false);

	// delete old message
	if ($result && !empty($object['_msguid']) && !empty($object['_mailbox'])) {
	$this->imap->delete_message($object['_msguid'], $object['_mailbox']);
	$this->cache->set($object['_msguid'], false, $object['_mailbox']);
	}
	else if ($result && $uid && ($msguid = $this->cache->uid2msguid($uid))) {
	$this->imap->delete_message($msguid, $this->name);
	$this->cache->set($object['_msguid'], false);
	}

	// update cache with new UID
	if ($result) {
	$object['_msguid'] = $result;
	$this->cache->set($result, $object);
	}
	}

	return $result;
	}


	/**
	* Delete the specified object from this folder.
	*
	* @param mixed $object The Kolab object to delete or object UID
	* @param boolean $expunge Should the folder be expunged?
	*
	* @return boolean True if successful, false on error
	*/
	public function delete($object, $expunge = true)
	{
	$msguid = is_array($object) ? $object['_msguid'] : $this->cache->uid2msguid($object);
	$success = false;

	if ($msguid && $expunge) {
	$success = $this->imap->delete_message($msguid, $this->name);
	}
	else if ($msguid) {
	$success = $this->imap->set_flag($msguid, 'DELETED', $this->name);
	}

	if ($success) {
	$this->cache->set($result, false);
	}

	return $success;
	}


	/**
	*
	*/
	public function delete_all()
	{
	$this->cache->purge();
	return $this->imap->clear_folder($this->name);
	}


	/**
	* Restore a previously deleted object
	*
	* @param string Object UID
	* @return mixed Message UID on success, false on error
	*/
	public function undelete($uid)
	{
	if ($msguid = $this->cache->uid2msguid($uid, true)) {
	if ($this->imap->set_flag($msguid, 'UNDELETED', $this->name)) {
	return $msguid;
	}
	}

	return false;
	}


	/**
	* Move a Kolab object message to another IMAP folder
	*
	* @param string Object UID
	* @param string IMAP folder to move object to
	* @return boolean True on success, false on failure
	*/
	public function move($uid, $target_folder)
	{
	if ($msguid = $this->cache->uid2msguid($uid)) {
	if ($success = $this->imap->move_message($msguid, $target_folder, $this->name)) {
	$this->cache->move($msguid, $uid, $target_folder);
	return true;
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Failed to move message $msguid to $target_folder: " . $this->imap->get_error_str(),
	), true);
	}
	}

	return false;
	}


	/**
	* Creates source of the configuration object message
	*/
	private function build_message(&$object, $type)
	{
	// load old object to preserve data we don't understand/process
	if (is_object($object['_formatobj']))
	$format = $object['_formatobj'];
	else if ($object['_msguid'] && ($old = $this->cache->get($object['_msguid'], $type, $object['_mailbox'])))
	$format = $old['_formatobj'];

	// create new kolab_format instance
	if (!$format)
	$format = kolab_format::factory($type);

	$format->set($object);
	$xml = $format->write();
	$object['uid'] = $format->uid; // read UID from format
	$object['_formatobj'] = $format;

	if (!$format->is_valid() \|\| empty($object['uid'])) {
	return false;
	}

	$mime = new Mail_mime("\r\n");
	$rcmail = rcube::get_instance();
	$headers = array();
	$part_id = 1;

	if ($ident = $rcmail->user->get_identity()) {
	$headers['From'] = $ident['email'];
	$headers['To'] = $ident['email'];
	}
	$headers['Date'] = date('r');
	$headers['X-Kolab-Type'] = self::KTYPE_PREFIX . $type;
	+ $headers['X-Kolab-Mime-Version'] = kolab_format::VERSION;
	$headers['Subject'] = $object['uid'];
	// $headers['Message-ID'] = $rcmail->gen_message_id();
	$headers['User-Agent'] = $rcmail->config->get('useragent');

	$mime->headers($headers);
	$mime->setTXTBody('This is a Kolab Groupware object. '
	. 'To view this object you will need an email client that understands the Kolab Groupware format. '
	. "For a list of such email clients please visit http://www.kolab.org/\n\n");

	$mime->addAttachment($xml, // file
	$format->CTYPE, // content-type
	'kolab.xml', // filename
	false, // is_file
	'8bit', // encoding
	'attachment', // disposition
	RCMAIL_CHARSET // charset
	);
	$part_id++;

	// save object attachments as separate parts
	// TODO: optimize memory consumption by using tempfiles for transfer
	foreach ((array)$object['_attachments'] as $name => $att) {
	if (empty($att['content']) && !empty($att['id'])) {
	$msguid = !empty($object['_msguid']) ? $object['_msguid'] : $object['uid'];
	$att['content'] = $this->get_attachment($msguid, $att['id'], $object['_mailbox']);
	}

	$headers = array('Content-ID' => Mail_mimePart::encodeHeader('Content-ID', '<' . $name . '>', RCMAIL_CHARSET, 'quoted-printable'));

	if (!empty($att['content'])) {
	$mime->addAttachment($att['content'], $att['mimetype'], $name, false, 'base64', 'attachment', '', '', '', null, null, '', null, $headers);
	$part_id++;
	}
	else if (!empty($att['path'])) {
	$mime->addAttachment($att['path'], $att['mimetype'], $name, true, 'base64', 'attachment', '', '', '', null, null, '', null, $headers);
	$part_id++;
	}

	$object['_attachments'][$name]['id'] = $part_id;
	}

	return $mime->getMessage();
	}


	/**
	* Triggers any required updates after changes within the
	* folder. This is currently only required for handling free/busy
	* information with Kolab.
	*
	* @return boolean\|PEAR_Error True if successfull.
	*/
	public function trigger()
	{
	$owner = $this->get_owner();
	$result = false;

	switch($this->type) {
	case 'event':
	if ($this->get_namespace() == 'personal') {
	$result = $this->trigger_url(
	sprintf('%s/trigger/%s/%s.pfb', kolab_storage::get_freebusy_server(), $owner, $this->imap->mod_folder($this->name)),
	$this->imap->options['user'],
	$this->imap->options['password']
	);
	}
	break;

	default:
	return true;
	}

	if ($result && is_object($result) && is_a($result, 'PEAR_Error')) {
	return PEAR::raiseError(sprintf("Failed triggering folder %s. Error was: %s",
	$this->name, $result->getMessage()));
	}

	return $result;
	}

	/**
	* Triggers a URL.
	*
	* @param string $url The URL to be triggered.
	* @param string $auth_user Username to authenticate with
	* @param string $auth_passwd Password for basic auth
	* @return boolean\|PEAR_Error True if successfull.
	*/
	private function trigger_url($url, $auth_user = null, $auth_passwd = null)
	{
	require_once('HTTP/Request2.php');

	try {
	$rcmail = rcube::get_instance();
	$request = new HTTP_Request2($url);
	$request->setConfig(array('ssl_verify_peer' => $rcmail->config->get('kolab_ssl_verify_peer', true)));

	// set authentication credentials
	if ($auth_user && $auth_passwd)
	$request->setAuth($auth_user, $auth_passwd);

	$result = $request->send();
	// rcube::write_log('trigger', $result->getBody());
	}
	catch (Exception $e) {
	return PEAR::raiseError($e->getMessage());
	}

	return true;
	}

	}

	diff --git a/plugins/libkolab/libkolab.php b/plugins/libkolab/libkolab.php
	index 4ecab46a..bff5c85d 100644
	--- a/plugins/libkolab/libkolab.php
	+++ b/plugins/libkolab/libkolab.php
	@@ -1,75 +1,75 @@
	<?php

	/**
	* Kolab core library
	*
	* Plugin to setup a basic environment for the interaction with a Kolab server.
	* Other Kolab-related plugins will depend on it and can use the library classes
	*
	* @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 libkolab extends rcube_plugin
	{
	/**
	* Required startup method of a Roundcube plugin
	*/
	public function init()
	{
	// load local config
	$this->load_config();

	$this->add_hook('storage_init', array($this, 'storage_init'));

	// extend include path to load bundled lib classes
	$include_path = $this->home . '/lib' . PATH_SEPARATOR . ini_get('include_path');
	set_include_path($include_path);

	$rcmail = rcmail::get_instance();
	try {
	kolab_format::$timezone = new DateTimeZone($rcmail->config->get('timezone', 'GMT'));
	}
	catch (Exception $e) {
	raise_error($e, true);
	kolab_format::$timezone = new DateTimeZone('GMT');
	}

	// load (old) dependencies if available
	if (@include_once('Horde/Util.php')) {
	include_once 'Horde/Kolab/Format.php';
	include_once 'Horde/Kolab/Format/XML.php';
	include_once 'Horde/Kolab/Format/XML/contact.php';
	include_once 'Horde/Kolab/Format/XML/event.php';
	include_once 'Horde_Kolab_Format_XML_configuration.php';

	String::setDefaultCharset('UTF-8');
	}
	}

	/**
	* Hook into IMAP FETCH HEADER.FIELDS command and request Kolab-specific headers
	*/
	function storage_init($p)
	{
	- $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE');
	+ $p['fetch_headers'] = trim($p['fetch_headers'] .' X-KOLAB-TYPE X-KOLAB-MIME-VERSION');
	return $p;
	}


	}

File Metadata

Mime Type: text/x-diff
Expires: Sun, Apr 5, 9:50 PM (3 w, 23 h ago)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 18831302
Default Alt Text: (56 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions