No OneTemporary
Actions

Size

99 KB

Referenced Files

None

Subscribers

None

View Options

	diff --git a/plugins/calendar/drivers/calendar_driver.php b/plugins/calendar/drivers/calendar_driver.php
	index e402db9a..742830b6 100644
	--- a/plugins/calendar/drivers/calendar_driver.php
	+++ b/plugins/calendar/drivers/calendar_driver.php
	@@ -1,797 +1,798 @@
	<?php

	/**
	* Driver interface for the Calendar plugin
	*
	* @version @package_version@
	* @author Lazlo Westerhof <hello@lazlo.me>
	* @author Thomas Bruederli <bruederli@kolabsys.com>
	*
	* Copyright (C) 2010, Lazlo Westerhof <hello@lazlo.me>
	* Copyright (C) 2012-2014, 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/>.
	*/


	/**
	* Struct of an internal event object how it is passed from/to the driver classes:
	*
	* $event = array(
	* 'id' => 'Event ID used for editing',
	* 'uid' => 'Unique identifier of this event',
	* 'calendar' => 'Calendar identifier to add event to or where the event is stored',
	* 'start' => DateTime, // Event start date/time as DateTime object
	* 'end' => DateTime, // Event end date/time as DateTime object
	* 'allday' => true\|false, // Boolean flag if this is an all-day event
	* 'changed' => DateTime, // Last modification date of event
	* 'title' => 'Event title/summary',
	* 'location' => 'Location string',
	* 'description' => 'Event description',
	* 'url' => 'URL to more information',
	* 'recurrence' => array( // Recurrence definition according to iCalendar (RFC 2445) specification as list of key-value pairs
	* 'FREQ' => 'DAILY\|WEEKLY\|MONTHLY\|YEARLY',
	* 'INTERVAL' => 1...n,
	* 'UNTIL' => DateTime,
	* 'COUNT' => 1..n, // number of times
	* // + more properties (see http://www.kanzaki.com/docs/ical/recur.html)
	* 'EXDATE' => array(), // list of DateTime objects of exception Dates/Times
	* 'EXCEPTIONS' => array(<event>), list of event objects which denote exceptions in the recurrence chain
	* ),
	* 'recurrence_id' => 'ID of the recurrence group', // usually the ID of the starting event
	* '_instance' => 'ID of the recurring instance', // identifies an instance within a recurrence chain
	* 'categories' => 'Event category',
	* 'free_busy' => 'free\|busy\|outofoffice\|tentative', // Show time as
	* 'status' => 'TENTATIVE\|CONFIRMED\|CANCELLED', // event status according to RFC 2445
	* 'priority' => 0-9, // Event priority (0=undefined, 1=highest, 9=lowest)
	* 'sensitivity' => 'public\|private\|confidential', // Event sensitivity
	* 'alarms' => '-15M:DISPLAY', // DEPRECATED Reminder settings inspired by valarm definition (e.g. display alert 15 minutes before event)
	* 'valarms' => array( // List of reminders (new format), each represented as a hash array:
	* array(
	* 'trigger' => '-PT90M', // ISO 8601 period string prefixed with '+' or '-', or DateTime object
	* 'action' => 'DISPLAY\|EMAIL\|AUDIO',
	* 'duration' => 'PT15M', // ISO 8601 period string
	* 'repeat' => 0, // number of repetitions
	* 'description' => '', // text to display for DISPLAY actions
	* 'summary' => '', // message text for EMAIL actions
	* 'attendees' => array(), // list of email addresses to receive alarm messages
	* ),
	* ),
	* 'attachments' => array( // List of attachments
	* 'name' => 'File name',
	* 'mimetype' => 'Content type',
	* 'size' => 1..n, // in bytes
	* 'id' => 'Attachment identifier'
	* ),
	* 'deleted_attachments' => array(), // array of attachment identifiers to delete when event is updated
	* 'attendees' => array( // List of event participants
	* 'name' => 'Participant name',
	* 'email' => 'Participant e-mail address', // used as identifier
	* 'role' => 'ORGANIZER\|REQ-PARTICIPANT\|OPT-PARTICIPANT\|CHAIR',
	* 'status' => 'NEEDS-ACTION\|UNKNOWN\|ACCEPTED\|TENTATIVE\|DECLINED'
	* 'rsvp' => true\|false,
	* ),
	*
	* '_savemode' => 'all\|future\|current\|new', // How changes on recurring event should be handled
	* '_notify' => true\|false, // whether to notify event attendees about changes
	* '_fromcalendar' => 'Calendar identifier where the event was stored before',
	* );
	*/

	/**
	* Interface definition for calendar driver classes
	*/
	abstract class calendar_driver
	{
	const BIRTHDAY_CALENDAR_ID = '__bdays__';

	// features supported by backend
	public $alarms = false;
	public $attendees = false;
	public $freebusy = false;
	public $attachments = false;
	public $undelete = false;
	public $history = false;
	public $categoriesimmutable = false;
	public $alarm_types = array('DISPLAY');
	public $alarm_absolute = true;
	public $last_error;

	protected $default_categories = array(
	'Personal' => 'c0c0c0',
	'Work' => 'ff0000',
	'Family' => '00ff00',
	'Holiday' => 'ff6600',
	);

	/**
	* Get a list of available calendars from this source
	*
	* @param bool $active Return only active calendars
	* @param bool $personal Return only personal calendars
	*
	* @return array List of calendars
	*/
	abstract function list_calendars($active = false, $personal = false);

	/**
	* Create a new calendar assigned to the current user
	*
	* @param array Hash array with calendar properties
	* name: Calendar name
	* color: The color of the calendar
	* showalarms: True if alarms are enabled
	* @return mixed ID of the calendar on success, False on error
	*/
	abstract function create_calendar($prop);

	/**
	* Update properties of an existing calendar
	*
	* @param array Hash array with calendar properties
	* id: Calendar Identifier
	* name: Calendar name
	* color: The color of the calendar
	* showalarms: True if alarms are enabled (if supported)
	* @return boolean True on success, Fales on failure
	*/
	abstract function edit_calendar($prop);

	/**
	* Set active/subscribed state of a calendar
	*
	* @param array Hash array with calendar properties
	* id: Calendar Identifier
	* active: True if calendar is active, false if not
	* @return boolean True on success, Fales on failure
	*/
	abstract function subscribe_calendar($prop);

	/**
	* Delete the given calendar with all its contents
	*
	* @param array Hash array with calendar properties
	* id: Calendar Identifier
	* @return boolean True on success, Fales on failure
	*/
	abstract function delete_calendar($prop);

	/**
	* Search for shared or otherwise not listed calendars the user has access
	*
	* @param string Search string
	* @param string Section/source to search
	* @return array List of calendars
	*/
	abstract function search_calendars($query, $source);

	/**
	* Add a single event to the database
	*
	* @param array Hash array with event properties (see header of this file)
	* @return mixed New event ID on success, False on error
	*/
	abstract function new_event($event);

	/**
	* Update an event entry with the given data
	*
	* @param array Hash array with event properties (see header of this file)
	* @return boolean True on success, False on error
	*/
	abstract function edit_event($event);

	/**
	* Extended event editing with possible changes to the argument
	*
	* @param array Hash array with event properties
	* @param string New participant status
	* @return boolean True on success, False on error
	*/
	public function edit_rsvp(&$event, $status)
	{
	return $this->edit_event($event);
	}

	/**
	* Move a single event
	*
	* @param array Hash array with event properties:
	* id: Event identifier
	* start: Event start date/time as DateTime object
	* end: Event end date/time as DateTime object
	* allday: Boolean flag if this is an all-day event
	* @return boolean True on success, False on error
	*/
	abstract function move_event($event);

	/**
	* Resize a single event
	*
	* @param array Hash array with event properties:
	* id: Event identifier
	* start: Event start date/time as DateTime object with timezone
	* end: Event end date/time as DateTime object with timezone
	* @return boolean True on success, False on error
	*/
	abstract function resize_event($event);

	/**
	* Remove a single event from the database
	*
	* @param array Hash array with event properties:
	* id: Event identifier
	* @param boolean Remove event irreversible (mark as deleted otherwise,
	* if supported by the backend)
	*
	* @return boolean True on success, False on error
	*/
	abstract function remove_event($event, $force = true);

	/**
	* Restores a single deleted event (if supported)
	*
	* @param array Hash array with event properties:
	* id: Event identifier
	*
	* @return boolean True on success, False on error
	*/
	public function restore_event($event)
	{
	return false;
	}

	/**
	* Return data of a single event
	*
	* @param mixed UID string or hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier (optional)
	* @param boolean If true, only writeable calendars shall be searched
	* @param boolean If true, only active calendars shall be searched
	* @param boolean If true, only personal calendars shall be searched
	*
	* @return array Event object as hash array
	*/
	abstract function get_event($event, $writeable = false, $active = false, $personal = false);

	/**
	* Get events from source.
	*
	* @param integer Date range start (unix timestamp)
	* @param integer Date range end (unix timestamp)
	* @param string Search query (optional)
	* @param mixed List of calendar IDs to load events from (either as array or comma-separated string)
	* @param boolean Include virtual/recurring events (optional)
	* @param integer Only list events modified since this time (unix timestamp)
	* @return array A list of event objects (see header of this file for struct of an event)
	*/
	abstract function load_events($start, $end, $query = null, $calendars = null, $virtual = 1, $modifiedsince = null);

	/**
	* Get number of events in the given calendar
	*
	* @param mixed List of calendar IDs to count events (either as array or comma-separated string)
	* @param integer Date range start (unix timestamp)
	* @param integer Date range end (unix timestamp)
	* @return array Hash array with counts grouped by calendar ID
	*/
	abstract function count_events($calendars, $start, $end = null);

	/**
	* Get a list of pending alarms to be displayed to the user
	*
	* @param integer Current time (unix timestamp)
	* @param mixed List of calendar IDs to show alarms for (either as array or comma-separated string)
	* @return array A list of alarms, each encoded as hash array:
	* id: Event identifier
	* uid: Unique identifier of this event
	* start: Event start date/time as DateTime object
	* end: Event end date/time as DateTime object
	* allday: Boolean flag if this is an all-day event
	* title: Event title/summary
	* location: Location string
	*/
	abstract function pending_alarms($time, $calendars = null);

	/**
	* (User) feedback after showing an alarm notification
	* This should mark the alarm as 'shown' or snooze it for the given amount of time
	*
	* @param string Event identifier
	* @param integer Suspend the alarm for this number of seconds
	*/
	abstract function dismiss_alarm($event_id, $snooze = 0);

	/**
	* Check the given event object for validity
	*
	* @param array Event object as hash array
	* @return boolean True if valid, false if not
	*/
	public function validate($event)
	{
	$valid = true;

	if (!is_object($event['start']) \|\| !is_a($event['start'], 'DateTime'))
	$valid = false;
	if (!is_object($event['end']) \|\| !is_a($event['end'], 'DateTime'))
	$valid = false;

	return $valid;
	}


	/**
	* Get list of event's attachments.
	* Drivers can return list of attachments as event property.
	* If they will do not do this list_attachments() method will be used.
	*
	* @param array $event Hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	*
	* @return array List of attachments, each as hash array:
	* id: Attachment identifier
	* name: Attachment name
	* mimetype: MIME content type of the attachment
	* size: Attachment size
	*/
	public function list_attachments($event) { }

	/**
	* Get attachment properties
	*
	* @param string $id Attachment identifier
	* @param array $event Hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	*
	* @return array Hash array with attachment properties:
	* id: Attachment identifier
	* name: Attachment name
	* mimetype: MIME content type of the attachment
	* size: Attachment size
	*/
	public function get_attachment($id, $event) { }

	/**
	* Get attachment body
	*
	* @param string $id Attachment identifier
	* @param array $event Hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	*
	* @return string Attachment body
	*/
	public function get_attachment_body($id, $event) { }

	/**
	* Build a struct representing the given message reference
	*
	* @param object\|string $uri_or_headers rcube_message_header instance holding the message headers
	* or an URI from a stored link referencing a mail message.
	* @param string $folder IMAP folder the message resides in
	*
	* @return array An struct referencing the given IMAP message
	*/
	public function get_message_reference($uri_or_headers, $folder = null)
	{
	// to be implemented by the derived classes
	return false;
	}

	/**
	* List availabale categories
	* The default implementation reads them from config/user prefs
	*/
	public function list_categories()
	{
	$rcmail = rcube::get_instance();
	return $rcmail->config->get('calendar_categories', $this->default_categories);
	}

	/**
	* Create a new category
	*/
	public function add_category($name, $color) { }

	/**
	* Remove the given category
	*/
	public function remove_category($name) { }

	/**
	* Update/replace a category
	*/
	public function replace_category($oldname, $name, $color) { }

	/**
	* Fetch free/busy information from a person within the given range
	*
	* @param string E-mail address of attendee
	* @param integer Requested period start date/time as unix timestamp
	* @param integer Requested period end date/time as unix timestamp
	*
	* @return array List of busy timeslots within the requested range
	*/
	public function get_freebusy_list($email, $start, $end)
	{
	return false;
	}

	/**
	* Create instances of a recurring event
	*
	* @param array Hash array with event properties
	* @param object DateTime Start date of the recurrence window
	* @param object DateTime End date of the recurrence window
	* @return array List of recurring event instances
	*/
	public function get_recurring_events($event, $start, $end = null)
	{
	$events = array();

	if ($event['recurrence']) {
	// include library class
	require_once(dirname(__FILE__) . '/../lib/calendar_recurrence.php');

	$rcmail = rcmail::get_instance();
	$recurrence = new calendar_recurrence($rcmail->plugins->get_plugin('calendar'), $event);
	+ $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';

	// determine a reasonable end date if none given
	if (!$end) {
	switch ($event['recurrence']['FREQ']) {
	case 'YEARLY': $intvl = 'P100Y'; break;
	case 'MONTHLY': $intvl = 'P20Y'; break;
	default: $intvl = 'P10Y'; break;
	}

	$end = clone $event['start'];
	$end->add(new DateInterval($intvl));
	}

	$i = 0;
	while ($next_event = $recurrence->next_instance()) {
	- $next_event['uid'] = $event['uid'] . '-' . ++$i;
	// add to output if in range
	if (($next_event['start'] <= $end && $next_event['end'] >= $start)) {
	- $next_event['id'] = $next_event['uid'];
	+ $next_event['_instance'] = $next_event['start']->format($recurrence_id_format);
	+ $next_event['id'] = $next_event['uid'] . '-' . $exception['_instance'];
	$next_event['recurrence_id'] = $event['uid'];
	$events[] = $next_event;
	}
	else if ($next_event['start'] > $end) { // stop loop if out of range
	break;
	}

	// avoid endless recursion loops
	- if ($i > 1000) {
	+ if (++$i > 1000) {
	break;
	}
	}
	}

	return $events;
	}

	/**
	* Provide a list of revisions for the given event
	*
	* @param array $event Hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	*
	* @return array List of changes, each as a hash array:
	* rev: Revision number
	* type: Type of the change (create, update, move, delete)
	* date: Change date
	* user: The user who executed the change
	* ip: Client IP
	* destination: Destination calendar for 'move' type
	*/
	public function get_event_changelog($event)
	{
	return false;
	}

	/**
	* Get a list of property changes beteen two revisions of an event
	*
	* @param array $event Hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	* @param mixed $rev Revisions: "from:to"
	*
	* @return array List of property changes, each as a hash array:
	* property: Revision number
	* old: Old property value
	* new: Updated property value
	*/
	public function get_event_diff($event, $rev)
	{
	return false;
	}

	/**
	* Return full data of a specific revision of an event
	*
	* @param mixed UID string or hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	* @param mixed $rev Revision number
	*
	* @return array Event object as hash array
	* @see self::get_event()
	*/
	public function get_event_revison($event, $rev)
	{
	return false;
	}

	/**
	* Command the backend to restore a certain revision of an event.
	* This shall replace the current event with an older version.
	*
	* @param mixed UID string or hash array with event properties:
	* id: Event identifier
	* calendar: Calendar identifier
	* @param mixed $rev Revision number
	*
	* @return boolean True on success, False on failure
	*/
	public function restore_event_revision($event, $rev)
	{
	return false;
	}


	/**
	* Callback function to produce driver-specific calendar create/edit form
	*
	* @param string Request action 'form-edit\|form-new'
	* @param array Calendar properties (e.g. id, color)
	* @param array Edit form fields
	*
	* @return string HTML content of the form
	*/
	public function calendar_form($action, $calendar, $formfields)
	{
	$html = '';
	foreach ($formfields as $field) {
	$html .= html::div('form-section',
	html::label($field['id'], $field['label']) .
	$field['value']);
	}

	return $html;
	}

	/**
	* Compose a list of birthday events from the contact records in the user's address books.
	*
	* This is a default implementation using Roundcube's address book API.
	* It can be overriden with a more optimized version by the individual drivers.
	*
	* @param integer Event's new start (unix timestamp)
	* @param integer Event's new end (unix timestamp)
	* @param string Search query (optional)
	* @param integer Only list events modified since this time (unix timestamp)
	* @return array A list of event records
	*/
	public function load_birthday_events($start, $end, $search = null, $modifiedsince = null)
	{
	// ignore update requests for simplicity reasons
	if (!empty($modifiedsince)) {
	return array();
	}

	// convert to DateTime for comparisons
	$start = new DateTime('@'.$start);
	$end = new DateTime('@'.$end);
	// extract the current year
	$year = $start->format('Y');
	$year2 = $end->format('Y');

	$events = array();
	$search = mb_strtolower($search);
	$rcmail = rcmail::get_instance();
	$cache = $rcmail->get_cache('calendar.birthdays', 'db', 3600);
	$cache->expunge();

	$alarm_type = $rcmail->config->get('calendar_birthdays_alarm_type', '');
	$alarm_offset = $rcmail->config->get('calendar_birthdays_alarm_offset', '-1D');
	$alarms = $alarm_type ? $alarm_offset . ':' . $alarm_type : null;

	// let the user select the address books to consider in prefs
	$selected_sources = $rcmail->config->get('calendar_birthday_adressbooks');
	$sources = $selected_sources ?: array_keys($rcmail->get_address_sources(false, true));
	foreach ($sources as $source) {
	$abook = $rcmail->get_address_book($source);

	// skip LDAP address books unless selected by the user
	if (!$abook \|\| ($abook instanceof rcube_ldap && empty($selected_sources))) {
	continue;
	}

	$abook->set_pagesize(10000);

	// check for cached results
	$cache_records = array();
	$cached = $cache->get($source);

	// iterate over (cached) contacts
	foreach (($cached ?: $abook->search('*', '', 2, true, true, array('birthday'))) as $contact) {
	if (is_array($contact) && !empty($contact['birthday'])) {
	try {
	if (is_array($contact['birthday']))
	$contact['birthday'] = reset($contact['birthday']);

	$bday = $contact['birthday'] instanceof DateTime ? $contact['birthday'] :
	new DateTime($contact['birthday'], new DateTimezone('UTC'));
	$birthyear = $bday->format('Y');
	}
	catch (Exception $e) {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
	true, false);
	continue;
	}

	$display_name = rcube_addressbook::compose_display_name($contact);
	$event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar');

	// add stripped record to cache
	if (empty($cached)) {
	$cache_records[] = array(
	'ID' => $contact['ID'],
	'name' => $display_name,
	'birthday' => $bday->format('Y-m-d'),
	);
	}

	// filter by search term (only name is involved here)
	if (!empty($search) && strpos(mb_strtolower($event_title), $search) === false) {
	continue;
	}

	// quick-and-dirty recurrence computation: just replace the year
	$bday->setDate($year, $bday->format('n'), $bday->format('j'));
	$bday->setTime(12, 0, 0);

	// date range reaches over multiple years: use end year if not in range
	if (($bday > $end \|\| $bday < $start) && $year2 != $year) {
	$bday->setDate($year2, $bday->format('n'), $bday->format('j'));
	$year = $year2;
	}

	// birthday is within requested range
	if ($bday <= $end && $bday >= $start) {
	$age = $year - $birthyear;
	$event = array(
	'id' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year),
	'calendar' => self::BIRTHDAY_CALENDAR_ID,
	'title' => $event_title,
	'description' => $rcmail->gettext(array('name' => 'birthdayage', 'vars' => array('age' => $age)), 'calendar'),
	// Add more contact information to description block?
	'allday' => true,
	'start' => $bday,
	'alarms' => $alarms,
	);
	$event['end'] = clone $bday;
	$event['end']->add(new DateInterval('PT1H'));

	$events[] = $event;
	}
	}
	}

	// store collected contacts in cache
	if (empty($cached)) {
	$cache->write($source, $cache_records);
	}
	}

	return $events;
	}

	/**
	* Get a single birthday calendar event
	*/
	public function get_birthday_event($id)
	{
	// decode $id
	list(,$source,$contact_id,$year) = explode(':', rcube_ldap::dn_decode($id));

	$rcmail = rcmail::get_instance();

	if ($source && $contact_id && ($abook = $rcmail->get_address_book($source))) {
	$contact = $abook->get_record($contact_id, true);

	if (is_array($contact) && !empty($contact['birthday'])) {
	try {
	if (is_array($contact['birthday']))
	$contact['birthday'] = reset($contact['birthday']);

	$bday = $contact['birthday'] instanceof DateTime ? $contact['birthday'] :
	new DateTime($contact['birthday'], new DateTimezone('UTC'));
	$birthyear = $bday->format('Y');
	}
	catch (Exception $e) {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => 'BIRTHDAY PARSE ERROR: ' . $e),
	true, false);

	return null;
	}

	$display_name = rcube_addressbook::compose_display_name($contact);
	$event_title = $rcmail->gettext(array('name' => 'birthdayeventtitle', 'vars' => array('name' => $display_name)), 'calendar');

	$event = array(
	'id' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $year),
	'uid' => rcube_ldap::dn_encode('bday:' . $source . ':' . $contact['ID'] . ':' . $birthyear),
	'calendar' => self::BIRTHDAY_CALENDAR_ID,
	'title' => $event_title,
	'description' => '',
	'allday' => true,
	'start' => $bday,
	'recurrence' => array('FREQ' => 'YEARLY', 'INTERVAL' => 1),
	'free_busy' => 'free',
	);
	$event['end'] = clone $bday;
	$event['end']->add(new DateInterval('PT1H'));

	return $event;
	}
	}

	return null;
	}

	/**
	* Store alarm dismissal for birtual birthay events
	*
	* @param string Event identifier
	* @param integer Suspend the alarm for this number of seconds
	*/
	public function dismiss_birthday_alarm($event_id, $snooze = 0)
	{
	$rcmail = rcmail::get_instance();
	$cache = $rcmail->get_cache('calendar.birthdayalarms', 'db', 86400 * 30);
	$cache->remove($event_id);

	// compute new notification time or disable if not snoozed
	$notifyat = $snooze > 0 ? time() + $snooze : null;
	$cache->set($event_id, array('snooze' => $snooze, 'notifyat' => $notifyat));

	return true;
	}

	/**
	* Handler for user_delete plugin hook
	*
	* @param array Hash array with hook arguments
	* @return array Return arguments for plugin hooks
	*/
	public function user_delete($args)
	{
	// TO BE OVERRIDDEN
	return $args;
	}
	}
	diff --git a/plugins/calendar/drivers/kolab/kolab_calendar.php b/plugins/calendar/drivers/kolab/kolab_calendar.php
	index 06a82448..b5b272fd 100644
	--- a/plugins/calendar/drivers/kolab/kolab_calendar.php
	+++ b/plugins/calendar/drivers/kolab/kolab_calendar.php
	@@ -1,827 +1,825 @@
	<?php

	/**
	* Kolab calendar storage class
	*
	* @version @package_version@
	* @author Thomas Bruederli <bruederli@kolabsys.com>
	* @author Aleksander Machniak <machniak@kolabsys.com>
	*
	* Copyright (C) 2012-2014, 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_calendar extends kolab_storage_folder_api
	{
	public $ready = false;
	public $readonly = true;
	public $attachments = true;
	public $alarms = false;
	public $history = false;
	public $subscriptions = true;
	public $categories = array();
	public $storage;

	public $type = 'event';

	protected $cal;
	protected $events = array();
	protected $search_fields = array('title', 'description', 'location', 'attendees');

	/**
	* Factory method to instantiate a kolab_calendar object
	*
	* @param string Calendar ID (encoded IMAP folder name)
	* @param object calendar plugin object
	* @return object kolab_calendar instance
	*/
	public static function factory($id, $calendar)
	{
	$imap = $calendar->rc->get_storage();
	$imap_folder = kolab_storage::id_decode($id);
	$info = $imap->folder_info($imap_folder, true);
	if (empty($info) \|\| $info['noselect'] \|\| strpos(kolab_storage::folder_type($imap_folder), 'event') !== 0) {
	return new kolab_user_calendar($imap_folder, $calendar);
	}
	else {
	return new kolab_calendar($imap_folder, $calendar);
	}
	}

	/**
	* Default constructor
	*/
	public function __construct($imap_folder, $calendar)
	{
	$this->cal = $calendar;
	$this->imap = $calendar->rc->get_storage();
	$this->name = $imap_folder;

	// ID is derrived from folder name
	$this->id = kolab_storage::folder_id($this->name, true);
	$old_id = kolab_storage::folder_id($this->name, false);

	// fetch objects from the given IMAP folder
	$this->storage = kolab_storage::get_folder($this->name);
	$this->ready = $this->storage && $this->storage->valid;

	// Set readonly and alarms flags according to folder permissions
	if ($this->ready) {
	if ($this->storage->get_namespace() == 'personal') {
	$this->readonly = false;
	$this->alarms = true;
	}
	else {
	$rights = $this->storage->get_myrights();
	if ($rights && !PEAR::isError($rights)) {
	if (strpos($rights, 'i') !== false)
	$this->readonly = false;
	}
	}

	// user-specific alarms settings win
	$prefs = $this->cal->rc->config->get('kolab_calendars', array());
	if (isset($prefs[$this->id]['showalarms']))
	$this->alarms = $prefs[$this->id]['showalarms'];
	else if (isset($prefs[$old_id]['showalarms']))
	$this->alarms = $prefs[$old_id]['showalarms'];
	}

	$this->default = $this->storage->default;
	$this->subtype = $this->storage->subtype;
	}


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

	/**
	*
	*/
	public function get_title()
	{
	return null;
	}


	/**
	* Return color to display this calendar
	*/
	public function get_color()
	{
	// color is defined in folder METADATA
	if ($color = $this->storage->get_color()) {
	return $color;
	}

	// calendar color is stored in user prefs (temporary solution)
	$prefs = $this->cal->rc->config->get('kolab_calendars', array());

	if (!empty($prefs[$this->id]) && !empty($prefs[$this->id]['color']))
	return $prefs[$this->id]['color'];

	return 'cc0000';
	}

	/**
	* Compose an URL for CalDAV access to this calendar (if configured)
	*/
	public function get_caldav_url()
	{
	if ($template = $this->cal->rc->config->get('calendar_caldav_url', null)) {
	return strtr($template, array(
	'%h' => $_SERVER['HTTP_HOST'],
	'%u' => urlencode($this->cal->rc->get_user_name()),
	'%i' => urlencode($this->storage->get_uid()),
	'%n' => urlencode($this->name),
	));
	}

	return false;
	}


	/**
	* Update properties of this calendar folder
	*
	* @see calendar_driver::edit_calendar()
	*/
	public function update(&$prop)
	{
	$prop['oldname'] = $this->get_realname();
	$newfolder = kolab_storage::folder_update($prop);

	if ($newfolder === false) {
	$this->cal->last_error = $this->cal->gettext(kolab_storage::$last_error);
	return false;
	}

	// create ID
	return kolab_storage::folder_id($newfolder);
	}

	/**
	* Getter for a single event object
	*/
	public function get_event($id)
	{
	// directly access storage object
	if (!$this->events[$id] && ($record = $this->storage->get_object($id)))
	$this->events[$id] = $this->_to_rcube_event($record);

	// event not found, maybe a recurring instance is requested
	if (!$this->events[$id]) {
	$master_id = preg_replace('/-\d+(T\d{6})?$/', '', $id);
	if ($master_id != $id && ($record = $this->storage->get_object($master_id)))
	$this->events[$master_id] = $this->_to_rcube_event($record);

	if (($master = $this->events[$master_id]) && $master['recurrence']) {
	$this->get_recurring_events($record, $master['start'], null, $id);
	}
	}

	return $this->events[$id];
	}


	/**
	* @param integer Event's new start (unix timestamp)
	* @param integer Event's new end (unix timestamp)
	* @param string Search query (optional)
	* @param boolean Include virtual events (optional)
	* @param array Additional parameters to query storage
	* @param array Additional query to filter events
	* @return array A list of event records
	*/
	public function list_events($start, $end, $search = null, $virtual = 1, $query = array(), $filter_query = null)
	{
	// convert to DateTime for comparisons
	try {
	$start = new DateTime('@'.$start);
	}
	catch (Exception $e) {
	$start = new DateTime('@0');
	}
	try {
	$end = new DateTime('@'.$end);
	}
	catch (Exception $e) {
	$end = new DateTime('today +10 years');
	}

	// get email addresses of the current user
	$user_emails = $this->cal->get_user_emails();

	// query Kolab storage
	$query[] = array('dtstart', '<=', $end);
	$query[] = array('dtend', '>=', $start);

	- // add query to exclude pending/declined invitations
	- if (empty($filter_query) && $this->get_namespace() != 'other') {
	- foreach ($user_emails as $email) {
	- $query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
	- $query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');
	- }
	- }
	- else if (is_array($filter_query)) {
	+ if (is_array($filter_query)) {
	$query = array_merge($query, $filter_query);
	}

	if (!empty($search)) {
	$search = mb_strtolower($search);
	+ $words = rcube_utils::tokenize_string($search, 1);
	foreach (rcube_utils::normalize_string($search, true) as $word) {
	$query[] = array('words', 'LIKE', $word);
	}
	}
	+ else {
	+ $words = array();
	+ }
	+
	+ // set partstat filter to skip pending and declined invitations
	+ if (empty($filter_query) && $this->get_namespace() != 'other') {
	+ $partstat_exclude = array('NEEDS-ACTION','DECLINED');
	+ }
	+ else {
	+ $partstat_exclude = array();
	+ }

	$events = array();
	foreach ($this->storage->select($query) as $record) {
	- // post-filter events to skip pending and declined invitations
	- if (empty($filter_query) && is_array($record['attendees']) && $this->get_namespace() != 'other') {
	- foreach ($record['attendees'] as $attendee) {
	- if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], array('NEEDS-ACTION','DECLINED'))) {
	- continue 2;
	- }
	- }
	- }
	-
	$event = $this->_to_rcube_event($record);
	$this->events[$event['id']] = $event;

	// remember seen categories
	if ($event['categories'])
	$this->categories[$event['categories']]++;

	- // filter events by search query
	- if (!empty($search)) {
	- $hits = 0;
	- $words = rcube_utils::tokenize_string($search, 1);
	- foreach ($words as $word) {
	- $hits += $this->_fulltext_match($event, $word);
	- }
	-
	- if ($hits < count($words)) // skip this event if not match with search term
	- continue;
	- }
	-
	// list events in requested time window
	if ($event['start'] <= $end && $event['end'] >= $start) {
	unset($event['_attendees']);
	$add = true;

	// skip the first instance of a recurring event if listed in exdate
	if ($virtual && (!empty($event['recurrence']['EXDATE']) \|\| !empty($event['recurrence']['EXCEPTIONS']))) {
	$event_date = $event['start']->format('Ymd');
	$exdates = (array)$event['recurrence']['EXDATE'];

	// add dates from exceptions to list
	if (is_array($event['recurrence']['EXCEPTIONS'])) {
	foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
	$exdates[] = clone $exception['start'];
	}
	}

	foreach ($exdates as $exdate) {
	if ($exdate->format('Ymd') == $event_date) {
	$add = false;
	break;
	}
	}
	}

	if ($add)
	$events[] = $event;
	}
	-
	+
	// resolve recurring events
	if ($record['recurrence'] && $virtual == 1) {
	$events = array_merge($events, $this->get_recurring_events($record, $start, $end));
	+ }
	+ }

	- // when searching, only recurrence exceptions may match the query so post-filter the results again
	- if (!empty($search) && $record['recurrence']['EXCEPTIONS']) {
	- $me = $this;
	- $events = array_filter($events, function($event) use ($words, $me) {
	- $hits = 0;
	- foreach ($words as $word) {
	- $hits += $me->_fulltext_match($event, $word, false);
	- }
	- return $hits >= count($words);
	- });
	+ // post-filter all events by fulltext search and partstat values
	+ $me = $this;
	+ $events = array_filter($events, function($event) use ($words, $partstat_exclude, $user_emails, $me) {
	+ // fulltext search
	+ if (count($words)) {
	+ $hits = 0;
	+ foreach ($words as $word) {
	+ $hits += $me->_fulltext_match($event, $word, false);
	+ }
	+ if ($hits < count($words)) {
	+ return false;
	}
	}
	- }
	+
	+ // partstat filter
	+ if (count($partstat_exclude) && is_array($event['attendees'])) {
	+ foreach ($event['attendees'] as $attendee) {
	+ if (in_array($attendee['email'], $user_emails) && in_array($attendee['status'], $partstat_exclude)) {
	+ return false;
	+ }
	+ }
	+ }
	+
	+ return true;
	+ });

	// avoid session race conditions that will loose temporary subscriptions
	$this->cal->rc->session->nowrite = true;

	return $events;
	}

	/**
	*
	* @param integer Date range start (unix timestamp)
	* @param integer Date range end (unix timestamp)
	* @param array Additional query to filter events
	* @return integer Count
	*/
	public function count_events($start, $end = null, $filter_query = null)
	{
	// convert to DateTime for comparisons
	try {
	$start = new DateTime('@'.$start);
	}
	catch (Exception $e) {
	$start = new DateTime('@0');
	}
	if ($end) {
	try {
	$end = new DateTime('@'.$end);
	}
	catch (Exception $e) {
	$end = null;
	}
	}

	// query Kolab storage
	$query[] = array('dtend', '>=', $start);

	if ($end)
	$query[] = array('dtstart', '<=', $end);

	// add query to exclude pending/declined invitations
	if (empty($filter_query)) {
	foreach ($this->cal->get_user_emails() as $email) {
	$query[] = array('tags', '!=', 'x-partstat:' . $email . ':needs-action');
	$query[] = array('tags', '!=', 'x-partstat:' . $email . ':declined');
	}
	}
	else if (is_array($filter_query)) {
	$query = array_merge($query, $filter_query);
	}

	// we rely the Kolab storage query (no post-filtering)
	return $this->storage->count($query);
	}

	/**
	* Create a new event record
	*
	* @see calendar_driver::new_event()
	*
	* @return mixed The created record ID on success, False on error
	*/
	public function insert_event($event)
	{
	if (!is_array($event))
	return false;

	// email links are stored separately
	$links = $event['links'];
	unset($event['links']);

	//generate new event from RC input
	$object = $this->_from_rcube_event($event);
	$saved = $this->storage->save($object, 'event');

	if (!$saved) {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving event object to Kolab server"),
	true, false);
	$saved = false;
	}
	else {
	// save links in configuration.relation object
	$this->save_links($event['uid'], $links);

	$event['id'] = $event['uid'];
	$this->events = array($event['uid'] => $this->_to_rcube_event($object));
	}

	return $saved;
	}

	/**
	* Update a specific event record
	*
	* @see calendar_driver::new_event()
	* @return boolean True on success, False on error
	*/

	public function update_event($event, $exception_id = null)
	{
	$updated = false;
	$old = $this->storage->get_object($event['id']);
	if (!$old \|\| PEAR::isError($old))
	return false;

	// email links are stored separately
	$links = $event['links'];
	unset($event['links']);

	$object = $this->_from_rcube_event($event, $old);
	$saved = $this->storage->save($object, 'event', $event['id']);

	if (!$saved) {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error saving event object to Kolab server"),
	true, false);
	}
	else {
	// save links in configuration.relation object
	$this->save_links($event['uid'], $links);

	$updated = true;
	$this->events = array($event['id'] => $this->_to_rcube_event($object));

	// refresh local cache with recurring instances
	if ($exception_id) {
	$this->get_recurring_events($object, $event['start'], $event['end'], $exception_id);
	}
	}

	return $updated;
	}

	/**
	* Delete an event record
	*
	* @see calendar_driver::remove_event()
	* @return boolean True on success, False on error
	*/
	public function delete_event($event, $force = true)
	{
	$deleted = $this->storage->delete($event['id'], $force);

	if (!$deleted) {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error deleting event object from Kolab server"),
	true, false);
	}

	return $deleted;
	}

	/**
	* Restore deleted event record
	*
	* @see calendar_driver::undelete_event()
	* @return boolean True on success, False on error
	*/
	public function restore_event($event)
	{
	if ($this->storage->undelete($event['id'])) {
	return true;
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Error undeleting the event object $event[id] from the Kolab server"),
	true, false);
	}

	return false;
	}

	/**
	* Find messages linked with an event
	*/
	protected function get_links($uid)
	{
	$storage = kolab_storage_config::get_instance();
	return $storage->get_object_links($uid);
	}

	/**
	*
	*/
	protected function save_links($uid, $links)
	{
	// make sure we have a valid array
	if (empty($links)) {
	$links = array();
	}

	$storage = kolab_storage_config::get_instance();
	$remove = array_diff($storage->get_object_links($uid), $links);
	return $storage->save_object_links($uid, $links, $remove);
	}

	/**
	* Create instances of a recurring event
	*
	* @param array Hash array with event properties
	* @param object DateTime Start date of the recurrence window
	* @param object DateTime End date of the recurrence window
	* @param string ID of a specific recurring event instance
	* @return array List of recurring event instances
	*/
	public function get_recurring_events($event, $start, $end = null, $event_id = null)
	{
	$object = $event['_formatobj'];
	if (!$object) {
	$rec = $this->storage->get_object($event['id']);
	$object = $rec['_formatobj'];
	}
	if (!is_object($object))
	return array();

	// determine a reasonable end date if none given
	if (!$end) {
	switch ($event['recurrence']['FREQ']) {
	case 'YEARLY': $intvl = 'P100Y'; break;
	case 'MONTHLY': $intvl = 'P20Y'; break;
	default: $intvl = 'P10Y'; break;
	}

	$end = clone $event['start'];
	$end->add(new DateInterval($intvl));
	}

	// copy the recurrence rule from the master event (to be used in the UI)
	$recurrence_rule = $event['recurrence'];
	unset($recurrence_rule['EXCEPTIONS'], $recurrence_rule['EXDATE']);

	// read recurrence exceptions first
	$events = array();
	$exdata = array();
	$futuredata = array();
	$recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';

	if (is_array($event['recurrence']['EXCEPTIONS'])) {
	foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
	if (!$exception['_instance'] && is_a($exception['recurrence_date'], 'DateTime'))
	$exception['_instance'] = $exception['recurrence_date']->format($recurrence_id_format);
	else if (!$exception['_instance'] && is_a($exception['start'], 'DateTime'))
	$exception['_instance'] = $exception['start']->format($recurrence_id_format);

	$rec_event = $this->_to_rcube_event($exception);
	$rec_event['id'] = $event['uid'] . '-' . $exception['_instance'];
	$rec_event['isexception'] = 1;

	// found the specifically requested instance, exiting...
	if ($rec_event['id'] == $event_id) {
	$rec_event['recurrence'] = $recurrence_rule;
	$rec_event['recurrence_id'] = $event['uid'];
	$events[] = $rec_event;
	$this->events[$rec_event['id']] = $rec_event;
	return $events;
	}

	// remember this exception's date
	$exdate = substr($exception['_instance'], 0, 8);
	$exdata[$exdate] = $rec_event;
	if ($rec_event['thisandfuture']) {
	$futuredata[$exdate] = $rec_event;
	}
	}
	}

	// use libkolab to compute recurring events
	if (class_exists('kolabcalendaring')) {
	$recurrence = new kolab_date_recurrence($object);
	}
	else {
	// fallback to local recurrence implementation
	require_once($this->cal->home . '/lib/calendar_recurrence.php');
	$recurrence = new calendar_recurrence($this->cal, $event);
	}

	$i = 0;
	while ($next_event = $recurrence->next_instance()) {
	$datestr = $next_event['start']->format('Ymd');
	$instance_id = $next_event['start']->format($recurrence_id_format);

	// use this event data for future recurring instances
	if ($futuredata[$datestr])
	$overlay_data = $futuredata[$datestr];

	// add to output if in range
	$rec_id = $event['uid'] . '-' . $instance_id;
	if (($next_event['start'] <= $end && $next_event['end'] >= $start) \|\| ($event_id && $rec_id == $event_id)) {
	$rec_event = $this->_to_rcube_event($next_event);
	$rec_event['_instance'] = $instance_id;

	if ($overlay_data \|\| $exdata[$datestr]) // copy data from exception
	$this->_merge_event_data($rec_event, $exdata[$datestr] ?: $overlay_data);

	$rec_event['id'] = $rec_id;
	$rec_event['recurrence_id'] = $event['uid'];
	$rec_event['recurrence'] = $recurrence_rule;
	unset($rec_event['_attendees']);
	$events[] = $rec_event;

	if ($rec_id == $event_id) {
	$this->events[$rec_id] = $rec_event;
	break;
	}
	}
	else if ($next_event['start'] > $end) // stop loop if out of range
	break;

	// avoid endless recursion loops
	if (++$i > 1000)
	break;
	}

	return $events;
	}

	/**
	* Merge certain properties from the overlay event to the base event object
	*
	* @param array The event object to be altered
	* @param array The overlay event object to be merged over $event
	*/
	private function _merge_event_data(&$event, $overlay)
	{
	static $forbidden = array('id','uid','recurrence','recurrence_date','organizer','_attachments');

	foreach ($overlay as $prop => $value) {
	// adjust time of the recurring event instance
	if ($prop == 'start' \|\| $prop == 'end') {
	if (is_object($event[$prop]) && is_a($event[$prop], 'DateTime')) {
	$event[$prop]->setTime($value->format('G'), intval($value->format('i')), intval($value->format('s')));
	// set date value if overlay is an exception of the current instance
	if (substr($overlay['_instance'], 0, 8) == substr($event['_instance'], 0, 8)) {
	$event[$prop]->setDate(intval($value->format('Y')), intval($value->format('n')), intval($value->format('j')));
	}
	}
	}
	else if ($prop[0] != '_' && !in_array($prop, $forbidden))
	$event[$prop] = $value;
	}
	}

	/**
	* Convert from Kolab_Format to internal representation
	*/
	private function _to_rcube_event($record)
	{
	$record['id'] = $record['uid'];
	$record['calendar'] = $this->id;
	$record['links'] = $this->get_links($record['uid']);

	if ($this->get_namespace() == 'other') {
	$record['className'] = 'fc-event-ns-other';
	$record = kolab_driver::add_partstat_class($record, array('NEEDS-ACTION','DECLINED'), $this->get_owner());
	}

	return kolab_driver::to_rcube_event($record);
	}

	/**
	* Convert the given event record into a data structure that can be passed to Kolab_Storage backend for saving
	* (opposite of self::_to_rcube_event())
	*/
	private function _from_rcube_event($event, $old = array())
	{
	// in kolab_storage attachments are indexed by content-id
	$event['_attachments'] = array();
	if (is_array($event['attachments'])) {
	foreach ($event['attachments'] as $attachment) {
	$key = null;
	// Roundcube ID has nothing to do with the storage ID, remove it
	if ($attachment['content'] \|\| $attachment['path']) {
	unset($attachment['id']);
	}
	else {
	foreach ((array)$old['_attachments'] as $cid => $oldatt) {
	if ($attachment['id'] == $oldatt['id'])
	$key = $cid;
	}
	}

	// flagged for deletion => set to false
	if ($attachment['_deleted']) {
	$event['_attachments'][$key] = false;
	}
	// replace existing entry
	else if ($key) {
	$event['_attachments'][$key] = $attachment;
	}
	// append as new attachment
	else {
	$event['_attachments'][] = $attachment;
	}
	}

	unset($event['attachments']);
	}

	// set current user as ORGANIZER
	$identity = $this->cal->rc->user->list_emails(true);
	if (empty($event['attendees']) && $identity['email'])
	$event['attendees'] = array(array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email']));

	$event['_owner'] = $identity['email'];

	// remove EXDATE values if RDATE is given
	if (!empty($event['recurrence']['RDATE'])) {
	$event['recurrence']['EXDATE'] = array();
	}

	// remove recurrence information (e.g. EXDATES and EXCEPTIONS) entirely
	if ($event['recurrence'] && empty($event['recurrence']['FREQ']) && empty($event['recurrence']['RDATE'])) {
	$event['recurrence'] = array();
	}

	// keep 'comment' from initial itip invitation
	if (!empty($old['comment'])) {
	$event['comment'] = $old['comment'];
	}

	// remove some internal properties which should not be saved
	unset($event['_savemode'], $event['_fromcalendar'], $event['_identity'], $event['_folder_id'], $event['className']);

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

	return $event;
	}

	/**
	* Match the given word in the event contents
	*/
	private function _fulltext_match($event, $word, $recursive = true)
	{
	$hits = 0;
	foreach ($this->search_fields as $col) {
	$sval = is_array($event[$col]) ? self::_complex2string($event[$col]) : $event[$col];
	if (empty($sval))
	continue;

	// do a simple substring matching (to be improved)
	$val = mb_strtolower($sval);
	if (strpos($val, $word) !== false) {
	$hits++;
	break;
	}
	}

	// search in recurrence exceptions
	if (!$hits && $recursive && !empty($event['recurrence']['EXCEPTIONS'])) {
	foreach ($event['recurrence']['EXCEPTIONS'] as $exception) {
	$hits = $this->_fulltext_match($exception, $word, false);
	if ($hits) break;
	}
	}

	return $hits;
	}

	/**
	* Convert a complex event attribute to a string value
	*/
	private static function _complex2string($prop)
	{
	static $ignorekeys = array('role','status','rsvp');

	$out = '';
	if (is_array($prop)) {
	foreach ($prop as $key => $val) {
	if (is_numeric($key)) {
	$out .= self::_complex2string($val);
	}
	else if (!in_array($key, $ignorekeys)) {
	$out .= $val . ' ';
	}
	}
	}
	else if (is_string($prop) \|\| is_numeric($prop)) {
	$out .= $prop . ' ';
	}

	return rtrim($out);
	}

	}
	diff --git a/plugins/libkolab/lib/kolab_format_event.php b/plugins/libkolab/lib/kolab_format_event.php
	index a5b0f737..0fda1e39 100644
	--- a/plugins/libkolab/lib/kolab_format_event.php
	+++ b/plugins/libkolab/lib/kolab_format_event.php
	@@ -1,280 +1,281 @@
	<?php

	/**
	* Kolab Event 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_event extends kolab_format_xcal
	{
	public $CTYPEv2 = 'application/x-vnd.kolab.event';

	public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'status', 'cancelled');

	protected $objclass = 'Event';
	protected $read_func = 'readEvent';
	protected $write_func = 'writeEvent';

	/**
	* Default constructor
	*/
	function __construct($data = null, $version = 3.0)
	{
	parent::__construct(is_string($data) ? $data : null, $version);

	// got an Event object as argument
	if (is_object($data) && is_a($data, $this->objclass)) {
	$this->obj = $data;
	$this->loaded = true;
	}

	// copy static property overriden by this class
	$this->_scheduling_properties = self::$scheduling_properties;
	}

	/**
	* Clones into an instance of libcalendaring's extended EventCal class
	*
	* @return mixed EventCal object or false on failure
	*/
	public function to_libcal()
	{
	static $error_logged = false;

	if (class_exists('kolabcalendaring')) {
	return new EventCal($this->obj);
	}
	else if (!$error_logged) {
	$error_logged = true;
	rcube::raise_error(array(
	'code' => 900, 'type' => 'php',
	'message' => "required kolabcalendaring module not found"
	), true);
	}

	return false;
	}

	/**
	* Set event properties to the kolabformat object
	*
	* @param array Event data as hash array
	*/
	public function set(&$object)
	{
	// set common xcal properties
	parent::set($object);

	// do the hard work of setting object values
	$this->obj->setStart(self::get_datetime($object['start'], null, $object['allday']));
	$this->obj->setEnd(self::get_datetime($object['end'], null, $object['allday']));
	$this->obj->setTransparency($object['free_busy'] == 'free');

	$status = kolabformat::StatusUndefined;
	if ($object['free_busy'] == 'tentative')
	$status = kolabformat::StatusTentative;
	if ($object['cancelled'])
	$status = kolabformat::StatusCancelled;
	else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
	$status = $this->status_map[$object['status']];
	$this->obj->setStatus($status);

	// save recurrence exceptions
	if (is_array($object['recurrence']) && is_array($object['recurrence']['EXCEPTIONS'])) {
	$recurrence_id_format = $object['allday'] ? 'Ymd' : 'Ymd\THis';
	$vexceptions = new vectorevent;
	foreach((array)$object['recurrence']['EXCEPTIONS'] as $i => $exception) {
	$exevent = new kolab_format_event;
	$exevent->set(($compacted = $this->compact_exception($exception, $object))); // only save differing values

	// get value for recurrence-id
	if (!empty($exception['recurrence_date']) && is_a($exception['recurrence_date'], 'DateTime')) {
	$recurrence_id = $exception['recurrence_date'];
	$compacted['_instance'] = $recurrence_id->format($recurrence_id_format);
	}
	else if (!empty($exception['_instance']) && strlen($exception['_instance']) > 4) {
	$recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $object['start']->getTimezone());
	$compacted['recurrence_date'] = $recurrence_id;
	}
	$exevent->obj->setRecurrenceID(self::get_datetime($recurrence_id ?: $exception['start'], null, $object['allday']), (bool)$exception['thisandfuture']);

	$vexceptions->push($exevent->obj);

	// write cleaned-up exception data back to memory/cache
	$object['recurrence']['EXCEPTIONS'][$i] = $this->expand_exception($compacted, $object);
	}
	$this->obj->setExceptions($vexceptions);
	}

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

	/**
	*
	*/
	public function is_valid()
	{
	return !$this->formaterror && (($this->data && !empty($this->data['start']) && !empty($this->data['end'])) \|\|
	(is_object($this->obj) && $this->obj->isValid() && $this->obj->uid()));
	}

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

	// read common xcal props
	$object = parent::to_array($data);

	// read object properties
	$object += array(
	'end' => self::php_datetime($this->obj->end()),
	'allday' => $this->obj->start()->isDateOnly(),
	'free_busy' => $this->obj->transparency() ? 'free' : 'busy', // TODO: transparency is only boolean
	'attendees' => array(),
	);

	// derive event end from duration (#1916)
	if (!$object['end'] && $object['start'] && ($duration = $this->obj->duration()) && $duration->isValid()) {
	$interval = new DateInterval('PT0S');
	$interval->d = $duration->weeks() * 7 + $duration->days();
	$interval->h = $duration->hours();
	$interval->i = $duration->minutes();
	$interval->s = $duration->seconds();
	$object['end'] = clone $object['start'];
	$object['end']->add($interval);
	}

	// organizer is part of the attendees list in Roundcube
	if ($object['organizer']) {
	$object['organizer']['role'] = 'ORGANIZER';
	array_unshift($object['attendees'], $object['organizer']);
	}

	// status defines different event properties...
	$status = $this->obj->status();
	if ($status == kolabformat::StatusTentative)
	$object['free_busy'] = 'tentative';
	else if ($status == kolabformat::StatusCancelled)
	$object['cancelled'] = true;

	// this is an exception object
	if ($this->obj->recurrenceID()->isValid()) {
	$object['thisandfuture'] = $this->obj->thisAndFuture();
	$object['recurrence_date'] = self::php_datetime($this->obj->recurrenceID());
	}
	// read exception event objects
	else if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
	$recurrence_exceptions = array();
	$recurrence_id_format = $object['allday'] ? 'Ymd' : 'Ymd\THis';
	for ($i=0; $i < $exceptions->size(); $i++) {
	if (($exobj = $exceptions->get($i))) {
	$exception = new kolab_format_event($exobj);
	if ($exception->is_valid()) {
	$exdata = $exception->to_array();

	// fix date-only recurrence ID saved by old versions
	if ($exdata['recurrence_date'] && $exdata['recurrence_date']->_dateonly && !$object['allday']) {
	$exdata['recurrence_date']->setTimezone($object['start']->getTimezone());
	$exdata['recurrence_date']->setTime($object['start']->format('G'), intval($object['start']->format('i')), intval($object['start']->format('s')));
	}

	$recurrence_id = $exdata['recurrence_date'] ?: $exdata['start'];
	$exdata['_instance'] = $recurrence_id->format($recurrence_id_format);
	$recurrence_exceptions[] = $this->expand_exception($exdata, $object);
	}
	}
	}
	$object['recurrence']['EXCEPTIONS'] = $recurrence_exceptions;
	}

	return $this->data = $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()
	+ public function get_tags($obj = null)
	{
	- $tags = parent::get_tags();
	+ $tags = parent::get_tags($obj);
	+ $object = $obj ?: $this->data;

	- foreach ((array)$this->data['categories'] as $cat) {
	+ foreach ((array)$object['categories'] as $cat) {
	$tags[] = rcube_utils::normalize_string($cat);
	}

	- return $tags;
	+ return array_unique($tags);
	}

	/**
	* Remove some attributes from the exception container
	*/
	private function compact_exception($exception, $master)
	{
	$forbidden = array('recurrence','organizer','_attachments');
	$whitelist = array('start','end');

	foreach ($forbidden as $prop) {
	if (array_key_exists($prop, $exception)) {
	unset($exception[$prop]);
	}
	}

	foreach ($master as $prop => $value) {
	if (isset($exception[$prop]) && gettype($exception[$prop]) == gettype($value) && $exception[$prop] == $value && !in_array($prop, $whitelist)) {
	unset($exception[$prop]);
	}
	}

	// preserve this property for date serialization
	$exception['allday'] = $master['allday'];

	return $exception;
	}

	/**
	* Copy attributes not specified by the exception from the master event
	*/
	private function expand_exception($exception, $master)
	{
	foreach ($master as $prop => $value) {
	if (empty($exception[$prop]) && !empty($value)) {
	$exception[$prop] = $value;
	if ($prop == 'recurrence') {
	unset($exception[$prop]['EXCEPTIONS']);
	}
	}
	}

	return $exception;
	}

	}
	diff --git a/plugins/libkolab/lib/kolab_format_task.php b/plugins/libkolab/lib/kolab_format_task.php
	index d3ddfe93..46408754 100644
	--- a/plugins/libkolab/lib/kolab_format_task.php
	+++ b/plugins/libkolab/lib/kolab_format_task.php
	@@ -1,140 +1,141 @@
	<?php

	/**
	* Kolab Task (ToDo) 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_task extends kolab_format_xcal
	{
	public $CTYPEv2 = 'application/x-vnd.kolab.task';

	public static $scheduling_properties = array('start', 'due', 'summary', 'status');

	protected $objclass = 'Todo';
	protected $read_func = 'readTodo';
	protected $write_func = 'writeTodo';

	/**
	* Default constructor
	*/
	function __construct($data = null, $version = 3.0)
	{
	parent::__construct(is_string($data) ? $data : null, $version);

	// copy static property overriden by this class
	$this->_scheduling_properties = self::$scheduling_properties;
	}

	/**
	* Set properties to the kolabformat object
	*
	* @param array Object data as hash array
	*/
	public function set(&$object)
	{
	// set common xcal properties
	parent::set($object);

	$this->obj->setPercentComplete(intval($object['complete']));

	$status = kolabformat::StatusUndefined;
	if ($object['complete'] == 100 && !array_key_exists('status', $object))
	$status = kolabformat::StatusCompleted;
	else if ($object['status'] && array_key_exists($object['status'], $this->status_map))
	$status = $this->status_map[$object['status']];
	$this->obj->setStatus($status);

	$this->obj->setStart(self::get_datetime($object['start'], null, $object['start']->_dateonly));
	$this->obj->setDue(self::get_datetime($object['due'], null, $object['due']->_dateonly));

	$related = new vectors;
	if (!empty($object['parent_id']))
	$related->push($object['parent_id']);
	$this->obj->setRelatedTo($related);

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

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

	/**
	* Convert the Configuration object into a hash array data structure
	*
	* @param array Additional data for merge
	*
	* @return array Config object data as hash array
	*/
	public function to_array($data = array())
	{
	// return cached result
	if (!empty($this->data))
	return $this->data;

	// read common xcal props
	$object = parent::to_array($data);

	$object['complete'] = intval($this->obj->percentComplete());

	// if due date is set
	if ($due = $this->obj->due())
	$object['due'] = self::php_datetime($due);

	// related-to points to parent task; we only support one relation
	$related = self::vector2array($this->obj->relatedTo());
	if (count($related))
	$object['parent_id'] = $related[0];

	// TODO: map more properties

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

	/**
	* 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()
	+ public function get_tags($obj = null)
	{
	- $tags = parent::get_tags();
	+ $tags = parent::get_tags($obj);
	+ $object = $obj ?: $this->data;

	- if ($this->data['status'] == 'COMPLETED' \|\| ($this->data['complete'] == 100 && empty($this->data['status'])))
	+ if ($object['status'] == 'COMPLETED' \|\| ($object['complete'] == 100 && empty($object['status'])))
	$tags[] = 'x-complete';

	- if ($this->data['priority'] == 1)
	+ if ($object['priority'] == 1)
	$tags[] = 'x-flagged';

	- if ($this->data['parent_id'])
	- $tags[] = 'x-parent:' . $this->data['parent_id'];
	+ if ($object['parent_id'])
	+ $tags[] = 'x-parent:' . $object['parent_id'];

	- return $tags;
	+ return array_unique($tags);
	}

	}
	diff --git a/plugins/libkolab/lib/kolab_format_xcal.php b/plugins/libkolab/lib/kolab_format_xcal.php
	index 6d49ad18..3d7bc274 100644
	--- a/plugins/libkolab/lib/kolab_format_xcal.php
	+++ b/plugins/libkolab/lib/kolab_format_xcal.php
	@@ -1,670 +1,678 @@
	<?php

	/**
	* Xcal based Kolab format class wrapping libkolabxml bindings
	*
	* Base class for xcal-based Kolab groupware objects such as event, todo, journal
	*
	* @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_xcal extends kolab_format
	{
	public $CTYPE = 'application/calendar+xml';

	public static $fulltext_cols = array('title', 'description', 'location', 'attendees:name', 'attendees:email', 'categories');

	public static $scheduling_properties = array('start', 'end', 'location');

	protected $_scheduling_properties = null;

	protected $sensitivity_map = array(
	'public' => kolabformat::ClassPublic,
	'private' => kolabformat::ClassPrivate,
	'confidential' => kolabformat::ClassConfidential,
	);

	protected $role_map = array(
	'REQ-PARTICIPANT' => kolabformat::Required,
	'OPT-PARTICIPANT' => kolabformat::Optional,
	'NON-PARTICIPANT' => kolabformat::NonParticipant,
	'CHAIR' => kolabformat::Chair,
	);

	protected $cutype_map = array(
	'INDIVIDUAL' => kolabformat::CutypeIndividual,
	'GROUP' => kolabformat::CutypeGroup,
	'ROOM' => kolabformat::CutypeRoom,
	'RESOURCE' => kolabformat::CutypeResource,
	'UNKNOWN' => kolabformat::CutypeUnknown,
	);

	protected $rrule_type_map = array(
	'MINUTELY' => RecurrenceRule::Minutely,
	'HOURLY' => RecurrenceRule::Hourly,
	'DAILY' => RecurrenceRule::Daily,
	'WEEKLY' => RecurrenceRule::Weekly,
	'MONTHLY' => RecurrenceRule::Monthly,
	'YEARLY' => RecurrenceRule::Yearly,
	);

	protected $weekday_map = array(
	'MO' => kolabformat::Monday,
	'TU' => kolabformat::Tuesday,
	'WE' => kolabformat::Wednesday,
	'TH' => kolabformat::Thursday,
	'FR' => kolabformat::Friday,
	'SA' => kolabformat::Saturday,
	'SU' => kolabformat::Sunday,
	);

	protected $alarm_type_map = array(
	'DISPLAY' => Alarm::DisplayAlarm,
	'EMAIL' => Alarm::EMailAlarm,
	'AUDIO' => Alarm::AudioAlarm,
	);

	protected $status_map = array(
	'NEEDS-ACTION' => kolabformat::StatusNeedsAction,
	'IN-PROCESS' => kolabformat::StatusInProcess,
	'COMPLETED' => kolabformat::StatusCompleted,
	'CANCELLED' => kolabformat::StatusCancelled,
	'TENTATIVE' => kolabformat::StatusTentative,
	'CONFIRMED' => kolabformat::StatusConfirmed,
	'DRAFT' => kolabformat::StatusDraft,
	'FINAL' => kolabformat::StatusFinal,
	);

	protected $part_status_map = array(
	'UNKNOWN' => kolabformat::PartNeedsAction,
	'NEEDS-ACTION' => kolabformat::PartNeedsAction,
	'TENTATIVE' => kolabformat::PartTentative,
	'ACCEPTED' => kolabformat::PartAccepted,
	'DECLINED' => kolabformat::PartDeclined,
	'DELEGATED' => kolabformat::PartDelegated,
	);


	/**
	* Convert common xcard properties into a hash array data structure
	*
	* @param array Additional data for merge
	*
	* @return array Object data as hash array
	*/
	public function to_array($data = array())
	{
	// read common object props
	$object = parent::to_array($data);

	$status_map = array_flip($this->status_map);
	$sensitivity_map = array_flip($this->sensitivity_map);

	$object += array(
	'sequence' => intval($this->obj->sequence()),
	'title' => $this->obj->summary(),
	'location' => $this->obj->location(),
	'description' => $this->obj->description(),
	'url' => $this->obj->url(),
	'status' => $status_map[$this->obj->status()],
	'sensitivity' => $sensitivity_map[$this->obj->classification()],
	'priority' => $this->obj->priority(),
	'categories' => self::vector2array($this->obj->categories()),
	'start' => self::php_datetime($this->obj->start()),
	);

	if (method_exists($this->obj, 'comment')) {
	$object['comment'] = $this->obj->comment();
	}

	// read organizer and attendees
	if (($organizer = $this->obj->organizer()) && ($organizer->email() \|\| $organizer->name())) {
	$object['organizer'] = array(
	'email' => $organizer->email(),
	'name' => $organizer->name(),
	);
	}

	$role_map = array_flip($this->role_map);
	$cutype_map = array_flip($this->cutype_map);
	$part_status_map = array_flip($this->part_status_map);
	$attvec = $this->obj->attendees();
	for ($i=0; $i < $attvec->size(); $i++) {
	$attendee = $attvec->get($i);
	$cr = $attendee->contact();
	if ($cr->email() != $object['organizer']['email']) {
	$delegators = $delegatees = array();
	$vdelegators = $attendee->delegatedFrom();
	for ($j=0; $j < $vdelegators->size(); $j++) {
	$delegators[] = $vdelegators->get($j)->email();
	}
	$vdelegatees = $attendee->delegatedTo();
	for ($j=0; $j < $vdelegatees->size(); $j++) {
	$delegatees[] = $vdelegatees->get($j)->email();
	}

	$object['attendees'][] = array(
	'role' => $role_map[$attendee->role()],
	'cutype' => $cutype_map[$attendee->cutype()],
	'status' => $part_status_map[$attendee->partStat()],
	'rsvp' => $attendee->rsvp(),
	'email' => $cr->email(),
	'name' => $cr->name(),
	'delegated-from' => $delegators,
	'delegated-to' => $delegatees,
	);
	}
	}

	// read recurrence rule
	if (($rr = $this->obj->recurrenceRule()) && $rr->isValid()) {
	$rrule_type_map = array_flip($this->rrule_type_map);
	$object['recurrence'] = array('FREQ' => $rrule_type_map[$rr->frequency()]);

	if ($intvl = $rr->interval())
	$object['recurrence']['INTERVAL'] = $intvl;

	if (($count = $rr->count()) && $count > 0) {
	$object['recurrence']['COUNT'] = $count;
	}
	else if ($until = self::php_datetime($rr->end())) {
	$until->setTime($object['start']->format('G'), $object['start']->format('i'), 0);
	$object['recurrence']['UNTIL'] = $until;
	}

	if (($byday = $rr->byday()) && $byday->size()) {
	$weekday_map = array_flip($this->weekday_map);
	$weekdays = array();
	for ($i=0; $i < $byday->size(); $i++) {
	$daypos = $byday->get($i);
	$prefix = $daypos->occurence();
	$weekdays[] = ($prefix ? $prefix : '') . $weekday_map[$daypos->weekday()];
	}
	$object['recurrence']['BYDAY'] = join(',', $weekdays);
	}

	if (($bymday = $rr->bymonthday()) && $bymday->size()) {
	$object['recurrence']['BYMONTHDAY'] = join(',', self::vector2array($bymday));
	}

	if (($bymonth = $rr->bymonth()) && $bymonth->size()) {
	$object['recurrence']['BYMONTH'] = join(',', self::vector2array($bymonth));
	}

	if ($exdates = $this->obj->exceptionDates()) {
	for ($i=0; $i < $exdates->size(); $i++) {
	if ($exdate = self::php_datetime($exdates->get($i)))
	$object['recurrence']['EXDATE'][] = $exdate;
	}
	}
	}

	if ($rdates = $this->obj->recurrenceDates()) {
	for ($i=0; $i < $rdates->size(); $i++) {
	if ($rdate = self::php_datetime($rdates->get($i)))
	$object['recurrence']['RDATE'][] = $rdate;
	}
	}

	// read alarm
	$valarms = $this->obj->alarms();
	$alarm_types = array_flip($this->alarm_type_map);
	$object['valarms'] = array();
	for ($i=0; $i < $valarms->size(); $i++) {
	$alarm = $valarms->get($i);
	$type = $alarm_types[$alarm->type()];

	if ($type == 'DISPLAY' \|\| $type == 'EMAIL' \|\| $type == 'AUDIO') { // only some alarms are supported
	$valarm = array(
	'action' => $type,
	'summary' => $alarm->summary(),
	'description' => $alarm->description(),
	);

	if ($type == 'EMAIL') {
	$valarm['attendees'] = array();
	$attvec = $alarm->attendees();
	for ($j=0; $j < $attvec->size(); $j++) {
	$cr = $attvec->get($j);
	$valarm['attendees'][] = $cr->email();
	}
	}
	else if ($type == 'AUDIO') {
	$attach = $alarm->audioFile();
	$valarm['uri'] = $attach->uri();
	}

	if ($start = self::php_datetime($alarm->start())) {
	$object['alarms'] = '@' . $start->format('U');
	$valarm['trigger'] = $start;
	}
	else if ($offset = $alarm->relativeStart()) {
	$prefix = $alarm->relativeTo() == kolabformat::End ? '+' : '-';
	$value = $time = '';
	if ($w = $offset->weeks()) $value .= $w . 'W';
	else if ($d = $offset->days()) $value .= $d . 'D';
	else if ($h = $offset->hours()) $time .= $h . 'H';
	else if ($m = $offset->minutes()) $time .= $m . 'M';
	else if ($s = $offset->seconds()) $time .= $s . 'S';

	// assume 'at event time'
	if (empty($value) && empty($time)) {
	$prefix = '';
	$time = '0S';
	}

	$object['alarms'] = $prefix . $value . $time;
	$valarm['trigger'] = $prefix . 'P' . $value . ($time ? 'T' . $time : '');
	}

	// read alarm duration and repeat properties
	if (($duration = $alarm->duration()) && $duration->isValid()) {
	$value = $time = '';
	if ($w = $duration->weeks()) $value .= $w . 'W';
	else if ($d = $duration->days()) $value .= $d . 'D';
	else if ($h = $duration->hours()) $time .= $h . 'H';
	else if ($m = $duration->minutes()) $time .= $m . 'M';
	else if ($s = $duration->seconds()) $time .= $s . 'S';
	$valarm['duration'] = 'P' . $value . ($time ? 'T' . $time : '');
	$valarm['repeat'] = $alarm->numrepeat();
	}

	$object['alarms'] .= ':' . $type; // legacy property
	$object['valarms'][] = array_filter($valarm);
	}
	}

	$this->get_attachments($object);

	return $object;
	}


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

	$is_new = !$this->obj->uid();
	$old_sequence = $this->obj->sequence();
	$reschedule = $is_new;

	// set common object properties
	parent::set($object);

	// set sequence value
	if (!isset($object['sequence'])) {
	if ($is_new) {
	$object['sequence'] = 0;
	}
	else {
	$object['sequence'] = $old_sequence;

	// increment sequence when updating properties relevant for scheduling.
	// RFC 5545: "It is incremented [...] each time the Organizer makes a significant revision to the calendar component."
	if ($this->check_rescheduling($object)) {
	$object['sequence']++;
	}
	}
	}
	$this->obj->setSequence(intval($object['sequence']));

	if ($object['sequence'] > $old_sequence) {
	$reschedule = true;
	}

	$this->obj->setSummary($object['title']);
	$this->obj->setLocation($object['location']);
	$this->obj->setDescription($object['description']);
	$this->obj->setPriority($object['priority']);
	$this->obj->setClassification($this->sensitivity_map[$object['sensitivity']]);
	$this->obj->setCategories(self::array2vector($object['categories']));
	$this->obj->setUrl(strval($object['url']));

	if (method_exists($this->obj, 'setComment')) {
	$this->obj->setComment($object['comment']);
	}

	// process event attendees
	$attendees = new vectorattendee;
	foreach ((array)$object['attendees'] as $i => $attendee) {
	if ($attendee['role'] == 'ORGANIZER') {
	$object['organizer'] = $attendee;
	}
	else if ($attendee['email'] != $object['organizer']['email']) {
	$cr = new ContactReference(ContactReference::EmailReference, $attendee['email']);
	$cr->setName($attendee['name']);

	// set attendee RSVP if missing
	if (!isset($attendee['rsvp'])) {
	$object['attendees'][$i]['rsvp'] = $attendee['rsvp'] = true;
	}

	$att = new Attendee;
	$att->setContact($cr);
	$att->setPartStat($this->part_status_map[$attendee['status']]);
	$att->setRole($this->role_map[$attendee['role']] ? $this->role_map[$attendee['role']] : kolabformat::Required);
	$att->setCutype($this->cutype_map[$attendee['cutype']] ? $this->cutype_map[$attendee['cutype']] : kolabformat::CutypeIndividual);
	$att->setRSVP((bool)$attendee['rsvp']);

	if (!empty($attendee['delegated-from'])) {
	$vdelegators = new vectorcontactref;
	foreach ((array)$attendee['delegated-from'] as $delegator) {
	$vdelegators->push(new ContactReference(ContactReference::EmailReference, $delegator));
	}
	$att->setDelegatedFrom($vdelegators);
	}
	if (!empty($attendee['delegated-to'])) {
	$vdelegatees = new vectorcontactref;
	foreach ((array)$attendee['delegated-to'] as $delegatee) {
	$vdelegatees->push(new ContactReference(ContactReference::EmailReference, $delegatee));
	}
	$att->setDelegatedTo($vdelegatees);
	}

	if ($att->isValid()) {
	$attendees->push($att);
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid event attendee: " . json_encode($attendee),
	), true);
	}
	}
	}
	$this->obj->setAttendees($attendees);

	if ($object['organizer']) {
	$organizer = new ContactReference(ContactReference::EmailReference, $object['organizer']['email']);
	$organizer->setName($object['organizer']['name']);
	$this->obj->setOrganizer($organizer);
	}

	// save recurrence rule
	$rr = new RecurrenceRule;
	$rr->setFrequency(RecurrenceRule::FreqNone);

	if ($object['recurrence'] && !empty($object['recurrence']['FREQ'])) {
	$rr->setFrequency($this->rrule_type_map[$object['recurrence']['FREQ']]);

	if ($object['recurrence']['INTERVAL'])
	$rr->setInterval(intval($object['recurrence']['INTERVAL']));

	if ($object['recurrence']['BYDAY']) {
	$byday = new vectordaypos;
	foreach (explode(',', $object['recurrence']['BYDAY']) as $day) {
	$occurrence = 0;
	if (preg_match('/^([\d-]+)([A-Z]+)$/', $day, $m)) {
	$occurrence = intval($m[1]);
	$day = $m[2];
	}
	if (isset($this->weekday_map[$day]))
	$byday->push(new DayPos($occurrence, $this->weekday_map[$day]));
	}
	$rr->setByday($byday);
	}

	if ($object['recurrence']['BYMONTHDAY']) {
	$bymday = new vectori;
	foreach (explode(',', $object['recurrence']['BYMONTHDAY']) as $day)
	$bymday->push(intval($day));
	$rr->setBymonthday($bymday);
	}

	if ($object['recurrence']['BYMONTH']) {
	$bymonth = new vectori;
	foreach (explode(',', $object['recurrence']['BYMONTH']) as $month)
	$bymonth->push(intval($month));
	$rr->setBymonth($bymonth);
	}

	if ($object['recurrence']['COUNT'])
	$rr->setCount(intval($object['recurrence']['COUNT']));
	else if ($object['recurrence']['UNTIL'])
	$rr->setEnd(self::get_datetime($object['recurrence']['UNTIL'], null, true));

	if ($rr->isValid()) {
	// add exception dates (only if recurrence rule is valid)
	$exdates = new vectordatetime;
	foreach ((array)$object['recurrence']['EXDATE'] as $exdate)
	$exdates->push(self::get_datetime($exdate, null, true));
	$this->obj->setExceptionDates($exdates);
	}
	else {
	rcube::raise_error(array(
	'code' => 600, 'type' => 'php',
	'file' => __FILE__, 'line' => __LINE__,
	'message' => "Invalid event recurrence rule: " . json_encode($object['recurrence']),
	), true);
	}
	}

	$this->obj->setRecurrenceRule($rr);

	// save recurrence dates (aka RDATE)
	if (!empty($object['recurrence']['RDATE'])) {
	$rdates = new vectordatetime;
	foreach ((array)$object['recurrence']['RDATE'] as $rdate)
	$rdates->push(self::get_datetime($rdate, null, true));
	$this->obj->setRecurrenceDates($rdates);
	}

	// save alarm
	$valarms = new vectoralarm;
	if ($object['valarms']) {
	foreach ($object['valarms'] as $valarm) {
	if (!array_key_exists($valarm['action'], $this->alarm_type_map)) {
	continue; // skip unknown alarm types
	}

	if ($valarm['action'] == 'EMAIL') {
	$recipients = new vectorcontactref;
	foreach (($valarm['attendees'] ?: array($object['_owner'])) as $email) {
	$recipients->push(new ContactReference(ContactReference::EmailReference, $email));
	}
	$alarm = new Alarm(
	strval($valarm['summary'] ?: $object['title']),
	strval($valarm['description'] ?: $object['description']),
	$recipients
	);
	}
	else if ($valarm['action'] == 'AUDIO') {
	$attach = new Attachment;
	$attach->setUri($valarm['uri'] ?: 'null', 'unknown');
	$alarm = new Alarm($attach);
	}
	else {
	// action == DISPLAY
	$alarm = new Alarm(strval($valarm['summary'] ?: $object['title']));
	}

	if (is_object($valarm['trigger']) && $valarm['trigger'] instanceof DateTime) {
	$alarm->setStart(self::get_datetime($valarm['trigger'], new DateTimeZone('UTC')));
	}
	else {
	try {
	$prefix = $valarm['trigger'][0];
	$period = new DateInterval(preg_replace('/[^0-9PTWDHMS]/', '', $valarm['trigger']));
	$duration = new Duration($period->d, $period->h, $period->i, $period->s, $prefix == '-');
	}
	catch (Exception $e) {
	// skip alarm with invalid trigger values
	rcube::raise_error($e, true);
	continue;
	}

	$alarm->setRelativeStart($duration, $prefix == '-' ? kolabformat::Start : kolabformat::End);
	}

	if ($valarm['duration']) {
	try {
	$d = new DateInterval($valarm['duration']);
	$duration = new Duration($d->d, $d->h, $d->i, $d->s);
	$alarm->setDuration($duration, intval($valarm['repeat']));
	}
	catch (Exception $e) {
	// ignore
	}
	}

	$valarms->push($alarm);
	}
	}
	// legacy support
	else if ($object['alarms']) {
	list($offset, $type) = explode(":", $object['alarms']);

	if ($type == 'EMAIL' && !empty($object['_owner'])) { // email alarms implicitly go to event owner
	$recipients = new vectorcontactref;
	$recipients->push(new ContactReference(ContactReference::EmailReference, $object['_owner']));
	$alarm = new Alarm($object['title'], strval($object['description']), $recipients);
	}
	else { // default: display alarm
	$alarm = new Alarm($object['title']);
	}

	if (preg_match('/^@(\d+)/', $offset, $d)) {
	$alarm->setStart(self::get_datetime($d[1], new DateTimeZone('UTC')));
	}
	else if (preg_match('/^([-+]?)P?T?(\d+)([SMHDW])/', $offset, $d)) {
	$days = $hours = $minutes = $seconds = 0;
	switch ($d[3]) {
	case 'W': $days = 7*intval($d[2]); break;
	case 'D': $days = intval($d[2]); break;
	case 'H': $hours = intval($d[2]); break;
	case 'M': $minutes = intval($d[2]); break;
	case 'S': $seconds = intval($d[2]); break;
	}
	$alarm->setRelativeStart(new Duration($days, $hours, $minutes, $seconds, $d[1] == '-'), $d[1] == '-' ? kolabformat::Start : kolabformat::End);
	}

	$valarms->push($alarm);
	}
	$this->obj->setAlarms($valarms);

	$this->set_attachments($object);
	}

	/**
	* 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($obj = null)
	{
	$data = '';
	$object = $obj ?: $this->data;

	foreach (self::$fulltext_cols as $colname) {
	list($col, $field) = explode(':', $colname);

	if ($field) {
	$a = array();
	foreach ((array)$object[$col] as $attr)
	$a[] = $attr[$field];
	$val = join(' ', $a);
	}
	else {
	$val = is_array($object[$col]) ? join(' ', $object[$col]) : $object[$col];
	}

	if (strlen($val))
	$data .= $val . ' ';
	}

	$words = rcube_utils::normalize_string($data, true);

	// collect words from recurrence exceptions
	if (is_array($object['recurrence']) && $object['recurrence']['EXCEPTIONS']) {
	foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
	$words = array_merge($words, $this->get_words($exception));
	}
	}

	return array_unique($words);
	}

	/**
	* 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()
	+ public function get_tags($obj = null)
	{
	$tags = array();
	+ $object = $obj ?: $this->data;

	- if (!empty($this->data['valarms'])) {
	+ if (!empty($object['valarms'])) {
	$tags[] = 'x-has-alarms';
	}

	// create tags reflecting participant status
	- if (is_array($this->data['attendees'])) {
	- foreach ($this->data['attendees'] as $attendee) {
	+ if (is_array($object['attendees'])) {
	+ foreach ($object['attendees'] as $attendee) {
	if (!empty($attendee['email']) && !empty($attendee['status']))
	$tags[] = 'x-partstat:' . $attendee['email'] . ':' . strtolower($attendee['status']);
	}
	}

	- return $tags;
	+ // collect tags from recurrence exceptions
	+ if (is_array($object['recurrence']) && $object['recurrence']['EXCEPTIONS']) {
	+ foreach((array)$object['recurrence']['EXCEPTIONS'] as $exception) {
	+ $tags = array_merge($tags, $this->get_tags($exception));
	+ }
	+ }
	+
	+ return array_unique($tags);
	}

	/**
	* Identify changes considered relevant for scheduling
	*
	* @param array Hash array with NEW object properties
	* @param array Hash array with OLD object properties
	*
	* @return boolean True if changes affect scheduling, False otherwise
	*/
	public function check_rescheduling($object, $old = null)
	{
	$reschedule = false;

	if (!is_array($old)) {
	$old = $this->data['uid'] ? $this->data : $this->to_array();
	}

	foreach ($this->_scheduling_properties ?: self::$scheduling_properties as $prop) {
	$a = $old[$prop];
	$b = $object[$prop];
	if ($object['allday'] && ($prop == 'start' \|\| $prop == 'end') && $a instanceof DateTime && $b instanceof DateTime) {
	$a = $a->format('Y-m-d');
	$b = $b->format('Y-m-d');
	}
	if ($prop == 'recurrence') {
	unset($a['EXCEPTIONS']);
	unset($b['EXCEPTIONS']);
	$a = array_filter($a);
	$b = array_filter($b);
	}
	if ($a != $b) {
	$reschedule = true;
	break;
	}
	}

	return $reschedule;
	}
	}
	\ No newline at end of file

File Metadata

Mime Type: text/x-diff
Expires: Wed, Feb 4, 4:34 PM (5 h, 13 m)
Storage Engine: blob
Storage Format: Raw Data
Storage Handle: 427643
Default Alt Text: (99 KB)

No OneTemporaryActions

View Options

File Metadata

Event Timeline

No OneTemporary
Actions