summaryrefslogtreecommitdiff
path: root/plugins/calendar
diff options
context:
space:
mode:
authorThomas Bruederli <bruederli@kolabsys.com>2015-03-01 17:54:54 (GMT)
committerThomas Bruederli <bruederli@kolabsys.com>2015-03-01 17:54:59 (GMT)
commit4d2695f864865b775639944735d979977ed1fad7 (patch)
treec3f861023d1ca856ae0893adca9723cfc3cbcefa /plugins/calendar
parentd91d6f98a7f4c03b55d7283873d935fde0b8d50f (diff)
downloadroundcubemail-plugins-kolab-4d2695f864865b775639944735d979977ed1fad7.tar.gz
Bring database driver up to speed with recurring events and iTip invitations
Diffstat (limited to 'plugins/calendar')
-rw-r--r--plugins/calendar/calendar.php41
-rw-r--r--plugins/calendar/calendar_ui.js2
-rw-r--r--plugins/calendar/drivers/database/SQL/mysql.initial.sql4
-rw-r--r--plugins/calendar/drivers/database/SQL/mysql/2015022700.sql15
-rw-r--r--plugins/calendar/drivers/database/SQL/postgres.initial.sql4
-rw-r--r--plugins/calendar/drivers/database/SQL/postgres/2015022700.sql9
-rw-r--r--plugins/calendar/drivers/database/SQL/sqlite.initial.sql4
-rw-r--r--plugins/calendar/drivers/database/SQL/sqlite/2015022700.sql79
-rw-r--r--plugins/calendar/drivers/database/database_driver.php468
-rw-r--r--plugins/calendar/drivers/kolab/kolab_driver.php61
10 files changed, 540 insertions, 147 deletions
diff --git a/plugins/calendar/calendar.php b/plugins/calendar/calendar.php
index 6cf29db..f18c1d7 100644
--- a/plugins/calendar/calendar.php
+++ b/plugins/calendar/calendar.php
@@ -1970,9 +1970,6 @@ class calendar extends rcube_plugin
$event['attendees'][$owner]['role'] = 'ORGANIZER';
unset($event['attendees'][$owner]['rsvp']);
}
- else if ($organizer === false && $action == 'new' && ($identity = $this->rc->user->get_identity($event['_identity'])) && $identity['email']) {
- array_unshift($event['attendees'], array('role' => 'ORGANIZER', 'name' => $identity['name'], 'email' => $identity['email'], 'status' => 'ACCEPTED'));
- }
}
// mapping url => vurl because of the fullcalendar client script
@@ -2060,7 +2057,7 @@ class calendar extends rcube_plugin
// send CANCEL message to removed attendees
foreach ((array)$old['attendees'] as $attendee) {
- if ($attendee['ROLE'] == 'ORGANIZER' || !$attendee['email'] || in_array(strtolower($attendee['email']), $current))
+ if ($attendee['role'] == 'ORGANIZER' || !$attendee['email'] || in_array(strtolower($attendee['email']), $current))
continue;
$vevent = $old;
@@ -2296,6 +2293,42 @@ class calendar extends rcube_plugin
return $diff;
}
+ /**
+ * Update attendee properties on the given event object
+ *
+ * @param array The event object to be altered
+ * @param array List of hash arrays each represeting an updated/added attendee
+ */
+ public static function merge_attendee_data(&$event, $attendees, $removed = null)
+ {
+ if (!empty($attendees) && !is_array($attendees[0])) {
+ $attendees = array($attendees);
+ }
+
+ foreach ($attendees as $attendee) {
+ $found = false;
+
+ foreach ($event['attendees'] as $i => $candidate) {
+ if ($candidate['email'] == $attendee['email']) {
+ $event['attendees'][$i] = $attendee;
+ $found = true;
+ break;
+ }
+ }
+
+ if (!$found) {
+ $event['attendees'][] = $attendee;
+ }
+ }
+
+ // filter out removed attendees
+ if (!empty($removed)) {
+ $event['attendees'] = array_filter($event['attendees'], function($attendee) use ($removed) {
+ return !in_array($attendee['email'], $removed);
+ });
+ }
+ }
+
/**** Resource management functions ****/
diff --git a/plugins/calendar/calendar_ui.js b/plugins/calendar/calendar_ui.js
index e8edcc8..59e0f4a 100644
--- a/plugins/calendar/calendar_ui.js
+++ b/plugins/calendar/calendar_ui.js
@@ -2539,7 +2539,7 @@ function rcube_calendar_ui(settings)
// mark all recurring instances as temp
if (event.recurrence || event.recurrence_id) {
- var base_id = event.recurrence_id ? event.recurrence_id.replace(/-\d+(T\d{6})?$/, '') : event.id;
+ var base_id = event.recurrence_id ? event.recurrence_id : String(event.id).replace(/-\d+(T\d{6})?$/, '');
$.each(fc.fullCalendar('clientEvents', function(e){ return e.id == base_id || e.recurrence_id == base_id; }), function(i,ev) {
ev.temp = true;
ev.editable = false;
diff --git a/plugins/calendar/drivers/database/SQL/mysql.initial.sql b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
index fe1b848..57a7cfa 100644
--- a/plugins/calendar/drivers/database/SQL/mysql.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/mysql.initial.sql
@@ -28,6 +28,8 @@ CREATE TABLE IF NOT EXISTS `events` (
`calendar_id` int(11) UNSIGNED NOT NULL DEFAULT '0',
`recurrence_id` int(11) UNSIGNED NOT NULL DEFAULT '0',
`uid` varchar(255) NOT NULL DEFAULT '',
+ `instance` varchar(16) NOT NULL DEFAULT ''
+ `isexception` tinyint(1) NOT NULL DEFAULT '0',
`created` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
`changed` datetime NOT NULL DEFAULT '1000-01-01 00:00:00',
`sequence` int(1) UNSIGNED NOT NULL DEFAULT '0',
@@ -44,7 +46,7 @@ CREATE TABLE IF NOT EXISTS `events` (
`priority` tinyint(1) NOT NULL DEFAULT '0',
`sensitivity` tinyint(1) NOT NULL DEFAULT '0',
`status` varchar(32) NOT NULL DEFAULT '',
- `alarms` varchar(255) DEFAULT NULL,
+ `alarms` text DEFAULT NULL,
`attendees` text DEFAULT NULL,
`notifyat` datetime DEFAULT NULL,
PRIMARY KEY(`event_id`),
diff --git a/plugins/calendar/drivers/database/SQL/mysql/2015022700.sql b/plugins/calendar/drivers/database/SQL/mysql/2015022700.sql
new file mode 100644
index 0000000..06d30fe
--- /dev/null
+++ b/plugins/calendar/drivers/database/SQL/mysql/2015022700.sql
@@ -0,0 +1,15 @@
+-- add identifier for recurring instances and exceptions
+
+ALTER TABLE `events` ADD `instance` varchar(16) NOT NULL DEFAULT '' AFTER `uid`;
+ALTER TABLE `events` ADD `isexception` tinyint(1) NOT NULL DEFAULT '0' AFTER `instance`;
+
+UPDATE `events` SET `instance` = DATE_FORMAT(`start`, '%Y%m%d')
+ WHERE `recurrence_id` != 0 AND `instance` = '' AND `all_day` = 1;
+
+UPDATE `events` SET `instance` = DATE_FORMAT(`start`, '%Y%m%dT%k%i%s')
+ WHERE `recurrence_id` != 0 AND `instance` = '' AND `all_day` = 0;
+
+-- extend alarms columns for multiple values
+
+ALTER TABLE `events` CHANGE `alarms` `alarms` TEXT NULL DEFAULT NULL;
+
diff --git a/plugins/calendar/drivers/database/SQL/postgres.initial.sql b/plugins/calendar/drivers/database/SQL/postgres.initial.sql
index d1a8b03..a0b6172 100644
--- a/plugins/calendar/drivers/database/SQL/postgres.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/postgres.initial.sql
@@ -44,6 +44,8 @@ CREATE TABLE events (
REFERENCES calendars (calendar_id) ON UPDATE CASCADE ON DELETE CASCADE,
recurrence_id integer NOT NULL DEFAULT 0,
uid varchar(255) NOT NULL DEFAULT '',
+ instance varchar(16) NOT NULL DEFAULT '',
+ isexception smallint NOT NULL DEFAULT '0',
created timestamp without time zone DEFAULT now() NOT NULL,
changed timestamp without time zone DEFAULT now(),
sequence integer NOT NULL DEFAULT 0,
@@ -60,7 +62,7 @@ CREATE TABLE events (
priority smallint NOT NULL DEFAULT 0,
sensitivity smallint NOT NULL DEFAULT 0,
status character varying(32) NOT NULL DEFAULT '',
- alarms varchar(255) DEFAULT NULL,
+ alarms text DEFAULT NULL,
attendees text DEFAULT NULL,
notifyat timestamp without time zone DEFAULT NULL,
PRIMARY KEY (event_id)
diff --git a/plugins/calendar/drivers/database/SQL/postgres/2015022700.sql b/plugins/calendar/drivers/database/SQL/postgres/2015022700.sql
new file mode 100644
index 0000000..0de989e
--- /dev/null
+++ b/plugins/calendar/drivers/database/SQL/postgres/2015022700.sql
@@ -0,0 +1,9 @@
+-- add identifier for recurring instances and exceptions
+
+ALTER TABLE events ADD instance character varying(16) NOT NULL;
+ALTER TABLE events ADD isexception smallint NOT NULL DEFAULT '0';
+
+-- extend alarms columns for multiple values
+
+ALTER TABLE events ALTER COLUMN alarms TYPE text;
+
diff --git a/plugins/calendar/drivers/database/SQL/sqlite.initial.sql b/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
index ad02f90..a94c9b0 100644
--- a/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
+++ b/plugins/calendar/drivers/database/SQL/sqlite.initial.sql
@@ -27,6 +27,8 @@ CREATE TABLE events (
calendar_id integer NOT NULL default '0',
recurrence_id integer NOT NULL default '0',
uid varchar(255) NOT NULL default '',
+ instance varchar(16) NOT NULL default '',
+ isexception tinyint(1) NOT NULL default '0',
created datetime NOT NULL default '1000-01-01 00:00:00',
changed datetime NOT NULL default '1000-01-01 00:00:00',
sequence integer NOT NULL default '0',
@@ -43,7 +45,7 @@ CREATE TABLE events (
priority tinyint(1) NOT NULL default '0',
sensitivity tinyint(1) NOT NULL default '0',
status varchar(32) NOT NULL default '',
- alarms varchar(255) default NULL,
+ alarms text default NULL,
attendees text default NULL,
notifyat datetime default NULL,
CONSTRAINT fk_events_calendar_id FOREIGN KEY (calendar_id)
diff --git a/plugins/calendar/drivers/database/SQL/sqlite/2015022700.sql b/plugins/calendar/drivers/database/SQL/sqlite/2015022700.sql
new file mode 100644
index 0000000..9770701
--- /dev/null
+++ b/plugins/calendar/drivers/database/SQL/sqlite/2015022700.sql
@@ -0,0 +1,79 @@
+-- ALTER TABLE `events` ADD `instance` varchar(16) NOT NULL DEFAULT '' AFTER `uid`;
+-- ALTER TABLE `events` ADD `isexception` tinyint(3) NOT NULL DEFAULT '0' AFTER `instance`;
+-- ALTER TABLE `events` CHANGE `alarms` `alarms` TEXT NULL DEFAULT NULL;
+
+CREATE TABLE temp_events (
+ event_id integer NOT NULL PRIMARY KEY,
+ calendar_id integer NOT NULL default '0',
+ recurrence_id integer NOT NULL default '0',
+ uid varchar(255) NOT NULL default '',
+ created datetime NOT NULL default '1000-01-01 00:00:00',
+ changed datetime NOT NULL default '1000-01-01 00:00:00',
+ sequence integer NOT NULL default '0',
+ start datetime NOT NULL default '1000-01-01 00:00:00',
+ end datetime NOT NULL default '1000-01-01 00:00:00',
+ recurrence varchar(255) default NULL,
+ title varchar(255) NOT NULL,
+ description text NOT NULL,
+ location varchar(255) NOT NULL default '',
+ categories varchar(255) NOT NULL default '',
+ url varchar(255) NOT NULL default '',
+ all_day tinyint(1) NOT NULL default '0',
+ free_busy tinyint(1) NOT NULL default '0',
+ priority tinyint(1) NOT NULL default '0',
+ sensitivity tinyint(1) NOT NULL default '0',
+ status varchar(32) NOT NULL default '',
+ alarms varchar(255) default NULL,
+ attendees text default NULL,
+ notifyat datetime default NULL
+);
+
+INSERT INTO temp_events (event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat)
+ SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat
+ FROM events;
+
+DROP TABLE events;
+
+CREATE TABLE events (
+ event_id integer NOT NULL PRIMARY KEY,
+ calendar_id integer NOT NULL default '0',
+ recurrence_id integer NOT NULL default '0',
+ uid varchar(255) NOT NULL default '',
+ instance varchar(16) NOT NULL default '',
+ isexception tinyint(1) NOT NULL default '0',
+ created datetime NOT NULL default '1000-01-01 00:00:00',
+ changed datetime NOT NULL default '1000-01-01 00:00:00',
+ sequence integer NOT NULL default '0',
+ start datetime NOT NULL default '1000-01-01 00:00:00',
+ end datetime NOT NULL default '1000-01-01 00:00:00',
+ recurrence varchar(255) default NULL,
+ title varchar(255) NOT NULL,
+ description text NOT NULL,
+ location varchar(255) NOT NULL default '',
+ categories varchar(255) NOT NULL default '',
+ url varchar(255) NOT NULL default '',
+ all_day tinyint(1) NOT NULL default '0',
+ free_busy tinyint(1) NOT NULL default '0',
+ priority tinyint(1) NOT NULL default '0',
+ sensitivity tinyint(1) NOT NULL default '0',
+ status varchar(32) NOT NULL default '',
+ alarms text default NULL,
+ attendees text default NULL,
+ notifyat datetime default NULL,
+ CONSTRAINT fk_events_calendar_id FOREIGN KEY (calendar_id)
+ REFERENCES calendars(calendar_id)
+);
+
+INSERT INTO events (event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat)
+ SELECT event_id, calendar_id, recurrence_id, uid, created, changed, sequence, start, end, recurrence, title, description, location, categories, url, all_day, free_busy, priority, sensitivity, alarms, attendees, notifyat
+ FROM temp_events;
+
+DROP TABLE temp_events;
+
+-- Derrive instance columns from start date/time
+
+UPDATE events SET instance = strftime('%Y%m%d', start)
+ WHERE recurrence_id != 0 AND instance = '' AND all_day = 1;
+
+UPDATE events SET instance = strftime('%Y%m%dT%H%M%S', start)
+ WHERE recurrence_id != 0 AND instance = '' AND all_day = 0;
diff --git a/plugins/calendar/drivers/database/database_driver.php b/plugins/calendar/drivers/database/database_driver.php
index e7b5ab1..2b18352 100644
--- a/plugins/calendar/drivers/database/database_driver.php
+++ b/plugins/calendar/drivers/database/database_driver.php
@@ -3,12 +3,11 @@
/**
* Database driver 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>
+ * Copyright (C) 2012-2015, 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
@@ -29,6 +28,8 @@ class database_driver extends calendar_driver
{
const DB_DATE_FORMAT = 'Y-m-d H:i:s';
+ public static $scheduling_properties = array('start', 'end', 'allday', 'recurrence', 'location', 'cancelled');
+
// features this backend supports
public $alarms = true;
public $attendees = true;
@@ -277,56 +278,72 @@ class database_driver extends calendar_driver
if (!$event['calendar'])
$event['calendar'] = reset(array_keys($this->calendars));
- $event = $this->_save_preprocess($event);
-
- $this->rc->db->query(sprintf(
- "INSERT INTO " . $this->db_events . "
- (calendar_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, attendees, alarms, notifyat)
- VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
- $this->rc->db->quote_identifier('start'),
- $this->rc->db->quote_identifier('end'),
- $this->rc->db->now(),
- $this->rc->db->now()
- ),
- $event['calendar'],
- strval($event['uid']),
- $event['start']->format(self::DB_DATE_FORMAT),
- $event['end']->format(self::DB_DATE_FORMAT),
- intval($event['all_day']),
- $event['_recurrence'],
- strval($event['title']),
- strval($event['description']),
- strval($event['location']),
- join(',', (array)$event['categories']),
- strval($event['url']),
- intval($event['free_busy']),
- intval($event['priority']),
- intval($event['sensitivity']),
- strval($event['status']),
- $event['attendees'],
- $event['alarms'],
- $event['notifyat']
- );
+ if ($event_id = $this->_insert_event($event)) {
+ $this->_update_recurring($event);
+ }
- $event_id = $this->rc->db->insert_id($this->db_events);
+ return $event_id;
+ }
+
+ return false;
+ }
- if ($event_id) {
- $event['id'] = $event_id;
+ /**
+ *
+ */
+ private function _insert_event(&$event)
+ {
+ $event = $this->_save_preprocess($event);
- // add attachments
- if (!empty($event['attachments'])) {
- foreach ($event['attachments'] as $attachment) {
- $this->add_attachment($attachment, $event_id);
- unset($attachment);
- }
- }
+ $this->rc->db->query(sprintf(
+ "INSERT INTO " . $this->db_events . "
+ (calendar_id, created, changed, uid, recurrence_id, instance, isexception, %s, %s, all_day, recurrence,
+ title, description, location, categories, url, free_busy, priority, sensitivity, status, attendees, alarms, notifyat)
+ VALUES (?, %s, %s, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?, ?)",
+ $this->rc->db->quote_identifier('start'),
+ $this->rc->db->quote_identifier('end'),
+ $this->rc->db->now(),
+ $this->rc->db->now()
+ ),
+ $event['calendar'],
+ strval($event['uid']),
+ intval($event['recurrence_id']),
+ strval($event['_instance']),
+ intval($event['isexception']),
+ $event['start']->format(self::DB_DATE_FORMAT),
+ $event['end']->format(self::DB_DATE_FORMAT),
+ intval($event['all_day']),
+ $event['_recurrence'],
+ strval($event['title']),
+ strval($event['description']),
+ strval($event['location']),
+ join(',', (array)$event['categories']),
+ strval($event['url']),
+ intval($event['free_busy']),
+ intval($event['priority']),
+ intval($event['sensitivity']),
+ strval($event['status']),
+ $event['attendees'],
+ $event['alarms'],
+ $event['notifyat']
+ );
- $this->_update_recurring($event);
+ $event_id = $this->rc->db->insert_id($this->db_events);
+
+ if ($event_id) {
+ $event['id'] = $event_id;
+
+ // add attachments
+ if (!empty($event['attachments'])) {
+ foreach ($event['attachments'] as $attachment) {
+ $this->add_attachment($attachment, $event_id);
+ unset($attachment);
+ }
}
return $event_id;
}
-
+
return false;
}
@@ -342,10 +359,14 @@ class database_driver extends calendar_driver
$update_master = false;
$update_recurring = true;
$old = $this->get_event($event);
-
+ $ret = true;
+
+ // check if update affects scheduling and update attendee status accordingly
+ $reschedule = $this->_check_scheduling($event, $old, true);
+
// increment sequence number
- if ($old['sequence'] && empty($event['sequence']))
- $event['sequence'] = max($event['sequence'], $old['sequence']+1);
+ if (empty($event['sequence']) && $reschedule)
+ $event['sequence'] = max($event['sequence'], $old['sequence']) + 1;
// modify a recurring event, check submitted savemode to do the right things
if ($old['recurrence'] || $old['recurrence_id']) {
@@ -361,14 +382,20 @@ class database_driver extends calendar_driver
return $this->new_event($event);
case 'current':
- // add exception to master event
- $master['recurrence']['EXDATE'][] = $old['start'];
- $update_master = true;
-
- // just update this occurence (decouple from master)
+ // save as exception
+ $event['isexception'] = 1;
$update_recurring = false;
- $event['recurrence_id'] = 0;
- $event['recurrence'] = array();
+
+ // set exception to first instance (= master)
+ if ($event['id'] == $master['id']) {
+ $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';
+ $event += $old;
+ $event['recurrence_id'] = $master['id'];
+ $event['_instance'] = $old['start']->format($recurrence_id_format);
+ $event['isexception'] = 1;
+ $event_id = $this->_insert_event($event);
+ return $event_id;
+ }
break;
case 'future':
@@ -399,6 +426,8 @@ class database_driver extends calendar_driver
$update_recurring = true;
$event['recurrence_id'] = 0;
+ $event['isexception'] = 0;
+ $event['_instance'] = '';
break;
}
// else: 'future' == 'all' if modifying the master event
@@ -417,6 +446,7 @@ class database_driver extends calendar_driver
$new_duration = $event['end']->format('U') - $event['start']->format('U');
$diff = $old_start_date != $new_start_date || $old_start_time != $new_start_time || $old_duration != $new_duration;
+ $date_shift = $old['start']->diff($event['start']);
// shifted or resized
if ($diff && ($old_start_date == $new_start_date || $old_duration == $new_duration)) {
@@ -425,25 +455,157 @@ class database_driver extends calendar_driver
$event['end']->add(new DateInterval('PT'.$new_duration.'S'));
}
// dates did not change, use the ones from master
- else if ($event['start'] == $old['start'] && $event['end'] == $old['end']) {
+ else if ($new_start_date . $new_start_time == $old_start_date . $old_start_time) {
$event['start'] = $master['start'];
$event['end'] = $master['end'];
}
+
+ // adjust recurrence-id when start changed and therefore the entire recurrence chain changes
+ if (is_array($event['recurrence']) && ($old_start_date != $new_start_date || $old_start_time != $new_start_time)
+ && ($exceptions = $this->_load_exceptions($old))) {
+ $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';
+ foreach ($exceptions as $exception) {
+ $recurrence_id = rcube_utils::anytodatetime($exception['_instance'], $old['start']->getTimezone());
+ if (is_a($recurrence_id, 'DateTime')) {
+ $recurrence_id->add($date_shift);
+ $exception['_instance'] = $recurrence_id->format($recurrence_id_format);
+ $this->_update_event($exception, false);
+ }
+ }
+ }
+
+ $ret = $event['id']; // return master ID
break;
}
}
$success = $this->_update_event($event, $update_recurring);
+
if ($success && $update_master)
$this->_update_event($master, true);
- return $success;
+ return $success ? $ret : false;
}
return false;
}
/**
+ * Extended event editing with possible changes to the argument
+ *
+ * @param array Hash array with event properties
+ * @param string New participant status
+ * @param array List of hash arrays with updated attendees
+ * @return boolean True on success, False on error
+ */
+ public function edit_rsvp(&$event, $status, $attendees)
+ {
+ $update_event = $event;
+
+ // apply changes to master (and all exceptions)
+ if ($event['_savemode'] == 'all' && $event['recurrence_id']) {
+ $update_event = $this->get_event(array('id' => $event['recurrence_id']));
+ $update_event['_savemode'] = $event['_savemode'];
+ calendar::merge_attendee_data($update_event, $attendees);
+ }
+
+ if ($ret = $this->update_attendees($update_event, $attendees)) {
+ // replace $event with effectively updated event (for iTip reply)
+ if ($ret !== true && $ret != $update_event['id'] && ($new_event = $this->get_event(array('id' => $ret)))) {
+ $event = $new_event;
+ }
+ else {
+ $event = $update_event;
+ }
+ }
+
+ return $ret;
+ }
+
+ /**
+ * Update the participant status for the given attendees
+ *
+ * @see calendar_driver::update_attendees()
+ */
+ public function update_attendees(&$event, $attendees)
+ {
+ $success = $this->edit_event($event, true);
+
+ // apply attendee updates to recurrence exceptions too
+ if ($success && $event['_savemode'] == 'all' && !empty($event['recurrence']) && empty($event['recurrence_id']) && ($exceptions = $this->_load_exceptions($event))) {
+ foreach ($exceptions as $exception) {
+ calendar::merge_attendee_data($exception, $attendees);
+ $this->_update_event($exception, false);
+ }
+ }
+
+ return $success;
+ }
+
+ /**
+ * Determine whether the current change affects scheduling and reset attendee status accordingly
+ */
+ private function _check_scheduling(&$event, $old, $update = true)
+ {
+ // skip this check when importing iCal/iTip events
+ if (isset($event['sequence']) || !empty($event['_method'])) {
+ return false;
+ }
+
+ $reschedule = false;
+
+ // iterate through the list of properties considered 'significant' for scheduling
+ foreach (self::$scheduling_properties as $prop) {
+ $a = $old[$prop];
+ $b = $event[$prop];
+ if ($event['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' && is_array($a) && is_array($b)) {
+ unset($a['EXCEPTIONS'], $b['EXCEPTIONS']);
+ $a = array_filter($a);
+ $b = array_filter($b);
+
+ // advanced rrule comparison: no rescheduling if series was shortened
+ if ($a['COUNT'] && $b['COUNT'] && $b['COUNT'] < $a['COUNT']) {
+ unset($a['COUNT'], $b['COUNT']);
+ }
+ else if ($a['UNTIL'] && $b['UNTIL'] && $b['UNTIL'] < $a['UNTIL']) {
+ unset($a['UNTIL'], $b['UNTIL']);
+ }
+ }
+ if ($a != $b) {
+ $reschedule = true;
+ break;
+ }
+ }
+
+ // reset all attendee status to needs-action (#4360)
+ if ($update && $reschedule && is_array($event['attendees'])) {
+ $is_organizer = false;
+ $emails = $this->cal->get_user_emails();
+ $attendees = $event['attendees'];
+ foreach ($attendees as $i => $attendee) {
+ if ($attendee['role'] == 'ORGANIZER' && $attendee['email'] && in_array(strtolower($attendee['email']), $emails)) {
+ $is_organizer = true;
+ }
+ else if ($attendee['role'] != 'ORGANIZER' && $attendee['role'] != 'NON-PARTICIPANT' && $attendee['status'] != 'DELEGATED') {
+ $attendees[$i]['status'] = 'NEEDS-ACTION';
+ $attendees[$i]['rsvp'] = true;
+ }
+ }
+
+ // update attendees only if I'm the organizer
+ if ($is_organizer || ($event['organizer'] && in_array(strtolower($event['organizer']['email']), $emails))) {
+ $event['attendees'] = $attendees;
+ }
+ }
+
+ return $reschedule;
+ }
+
+ /**
* Convert save data to be used in SQL statements
*/
private function _save_preprocess($event)
@@ -478,17 +640,10 @@ class database_driver extends calendar_driver
}
// process event attendees
- $_attendees = '';
- foreach ((array)$event['attendees'] as $attendee) {
- if (!$attendee['name'] && !$attendee['email'])
- continue;
- $_attendees .= 'NAME="'.addcslashes($attendee['name'], '"') . '"' .
- ';STATUS=' . $attendee['status'].
- ';ROLE=' . $attendee['role'] .
- ';EMAIL=' . $attendee['email'] .
- "\n";
- }
- $event['attendees'] = rtrim($_attendees);
+ if (!empty($event['attendees']))
+ $event['attendees'] = json_encode((array)$event['attendees']);
+ else
+ $event['attendees'] = '';
return $event;
}
@@ -511,14 +666,14 @@ class database_driver extends calendar_driver
/**
* Save the given event record to database
*
- * @param array Event data, already passed through self::_save_preprocess()
+ * @param array Event data
* @param boolean True if recurring events instances should be updated, too
*/
private function _update_event($event, $update_recurring = true)
{
$event = $this->_save_preprocess($event);
$sql_set = array();
- $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'status', 'attendees', 'alarms', 'notifyat');
+ $set_cols = array('start', 'end', 'all_day', 'recurrence_id', 'isexception', 'sequence', 'title', 'description', 'location', 'categories', 'url', 'free_busy', 'priority', 'sensitivity', 'status', 'attendees', 'alarms', 'notifyat');
foreach ($set_cols as $col) {
if (is_object($event[$col]) && is_a($event[$col], 'DateTime'))
$sql_set[] = $this->rc->db->quote_identifier($col) . '=' . $this->rc->db->quote($event[$col]->format(self::DB_DATE_FORMAT));
@@ -531,6 +686,9 @@ class database_driver extends calendar_driver
if ($event['_recurrence'])
$sql_set[] = $this->rc->db->quote_identifier('recurrence') . '=' . $this->rc->db->quote($event['_recurrence']);
+ if ($event['_instance'])
+ $sql_set[] = $this->rc->db->quote_identifier('instance') . '=' . $this->rc->db->quote($event['_instance']);
+
if ($event['_fromcalendar'] && $event['_fromcalendar'] != $event['calendar'])
$sql_set[] = 'calendar_id=' . $this->rc->db->quote($event['calendar']);
@@ -578,17 +736,28 @@ class database_driver extends calendar_driver
{
if (empty($this->calendars))
return;
-
+
+ if (!empty($event['recurrence'])) {
+ $exdata = array();
+ $exceptions = $this->_load_exceptions($event);
+
+ foreach ($exceptions as $exception) {
+ $exdate = substr($exception['_instance'], 0, 8);
+ $exdata[$exdate] = $exception;
+ }
+ }
+
// clear existing recurrence copies
$this->rc->db->query(
"DELETE FROM " . $this->db_events . "
WHERE recurrence_id=?
+ AND isexception=0
AND calendar_id IN (" . $this->calendar_ids . ")",
$event['id']
);
-
+
// create new fake entries
- if ($event['recurrence']) {
+ if (!empty($event['recurrence'])) {
// include library class
require_once($this->cal->home . '/lib/calendar_recurrence.php');
@@ -596,15 +765,26 @@ class database_driver extends calendar_driver
$count = 0;
$duration = $event['start']->diff($event['end']);
+ $recurrence_id_format = $event['all_day'] ? 'Ymd' : 'Ymd\THis';
while ($next_start = $recurrence->next_start()) {
+ $instance = $next_start->format($recurrence_id_format);
+ $datestr = substr($instance, 0, 8);
+
+ // skip exceptions
+ // TODO: merge updated data from master event
+ if ($exdata[$datestr]) {
+ continue;
+ }
+
$next_start->setTimezone($this->server_timezone);
$next_end = clone $next_start;
$next_end->add($duration);
+
$notify_at = $this->_get_notification(array('alarms' => $event['alarms'], 'start' => $next_start, 'end' => $next_end, 'status' => $event['status']));
$query = $this->rc->db->query(sprintf(
"INSERT INTO " . $this->db_events . "
- (calendar_id, recurrence_id, created, changed, uid, %s, %s, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, notifyat)
- SELECT calendar_id, ?, %s, %s, uid, ?, ?, all_day, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, ?
+ (calendar_id, recurrence_id, created, changed, uid, instance, %s, %s, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, notifyat)
+ SELECT calendar_id, ?, %s, %s, uid, ?, ?, ?, all_day, sequence, recurrence, title, description, location, categories, url, free_busy, priority, sensitivity, status, alarms, attendees, ?
FROM " . $this->db_events . " WHERE event_id=? AND calendar_id IN (" . $this->calendar_ids . ")",
$this->rc->db->quote_identifier('start'),
$this->rc->db->quote_identifier('end'),
@@ -612,6 +792,7 @@ class database_driver extends calendar_driver
$this->rc->db->now()
),
$event['id'],
+ $instance,
$next_start->format(self::DB_DATE_FORMAT),
$next_end->format(self::DB_DATE_FORMAT),
$notify_at,
@@ -625,7 +806,51 @@ class database_driver extends calendar_driver
if (++$count > 999 || (!$recurrence->recurEnd && !$recurrence->recurCount && $next_start->format('Y') > date('Y') + 20))
break;
}
+
+ // remove all exceptions after recurrence end
+ if ($next_end && !empty($exceptions)) {
+ $this->rc->db->query(
+ "DELETE FROM " . $this->db_events . "
+ WHERE `recurrence_id`=?
+ AND `isexception`=1
+ AND `start` > ?
+ AND `calendar_id` IN (" . $this->calendar_ids . ")",
+ $event['id'],
+ $next_end->format(self::DB_DATE_FORMAT)
+ );
+ }
+ }
+ }
+
+ /**
+ *
+ */
+ private function _load_exceptions($event, $instance_id = null)
+ {
+ $sql_add_where = '';
+ if (!empty($instance_id)) {
+ $sql_add_where = 'AND `instance`=?';
+ }
+
+ $result = $this->rc->db->query(
+ "SELECT * FROM " . $this->db_events . "
+ WHERE `recurrence_id`=?
+ AND `isexception`=1
+ AND `calendar_id` IN (" . $this->calendar_ids . ")
+ $sql_add_where
+ ORDER BY `instance`, `start`",
+ $event['id'],
+ $instance_id
+ );
+
+ $exceptions = array();
+ while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result)) && $sql_arr['event_id']) {
+ $exception = $this->_read_postprocess($sql_arr);
+ $instance = $exception['_instance'] ?: $exception['start']->format($exception['allday'] ? 'Ymd' : 'Ymd\THis');
+ $exceptions[$instance] = $exception;
}
+
+ return $exceptions;
}
/**
@@ -743,10 +968,15 @@ class database_driver extends calendar_driver
*/
public function get_event($event, $writeable = false, $active = false, $personal = false)
{
- $id = is_array($event) ? ($event['id'] ? $event['id'] : $event['uid']) : $event;
+ $id = is_array($event) ? ($event['id'] ?: $event['uid']) : $event;
$cal = is_array($event) ? $event['calendar'] : null;
$col = is_array($event) && is_numeric($id) ? 'event_id' : 'uid';
+ $where_add = '';
+ if (is_array($event) && !$event['id'] && !empty($event['_instance'])) {
+ $where_add = 'AND instance=' . $this->rc->db->quote($event['_instance']);
+ }
+
if ($this->cache[$id])
return $this->cache[$id];
@@ -773,8 +1003,10 @@ class database_driver extends calendar_driver
WHERE event_id = e.event_id OR event_id = e.recurrence_id) AS _attachments
FROM " . $this->db_events . " AS e
WHERE e.calendar_id IN (%s)
- AND e.$col=?",
- $cals
+ AND e.$col=?
+ %s",
+ $cals,
+ $where_add
),
$id);
@@ -830,8 +1062,29 @@ class database_driver extends calendar_driver
$sql_add
));
- while ($result && ($event = $this->rc->db->fetch_assoc($result))) {
- $events[] = $this->_read_postprocess($event);
+ while ($result && ($sql_arr = $this->rc->db->fetch_assoc($result))) {
+ $event = $this->_read_postprocess($sql_arr);
+ $add = true;
+
+ if (!empty($event['recurrence']) && !$event['recurrence_id']) {
+ // load recurrence exceptions (i.e. for export)
+ if (!$virtual) {
+ $event['recurrence']['EXCEPTIONS'] = $this->_load_exceptions($event);
+ }
+ // check for exception on first instance
+ else {
+ $recurrence_id_format = $event['allday'] ? 'Ymd' : 'Ymd\THis';
+ $instance = $event['start']->format($recurrence_id_format);
+ $exceptions = $this->_load_exceptions($event, $instance);
+ if ($exceptions && is_array($exceptions[$instance])) {
+ $event = $exceptions[$instance];
+ $add = false;
+ }
+ }
+ }
+
+ if ($add)
+ $events[] = $event;
}
}
@@ -875,6 +1128,7 @@ class database_driver extends calendar_driver
$event['sensitivity'] = $sensitivity_map[$event['sensitivity']];
$event['calendar'] = $event['calendar_id'];
$event['recurrence_id'] = intval($event['recurrence_id']);
+ $event['isexception'] = intval($event['isexception']);
// parse recurrence rule
if ($event['recurrence'] && preg_match_all('/([A-Z]+)=([^;]+);?/', $event['recurrence'], $m, PREG_SET_ORDER)) {
@@ -892,21 +1146,25 @@ class database_driver extends calendar_driver
}
}
- if ($event['_attachments'] > 0)
+ if ($event['recurrence_id']) {
+ libcalendaring::identify_recurrence_instance($event);
+ }
+
+ if (strlen($event['instance'])) {
+ $event['_instance'] = $event['instance'];
+
+ if (empty($event['recurrence_id'])) {
+ $event['recurrence_date'] = rcube_utils::anytodatetime($event['_instance'], $event['start']->getTimezone());
+ }
+ }
+
+ if ($event['_attachments'] > 0) {
$event['attachments'] = (array)$this->list_attachments($event);
+ }
// decode serialized event attendees
- if ($event['attendees']) {
- $attendees = array();
- foreach (explode("\n", $event['attendees']) as $line) {
- $att = array();
- foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
- list($key, $value) = explode("=", $prop);
- $att[strtolower($key)] = stripslashes(trim($value, '""'));
- }
- $attendees[] = $att;
- }
- $event['attendees'] = $attendees;
+ if (strlen($event['attendees'])) {
+ $event['attendees'] = $this->unserialize_attendees($event['attendees']);
}
else {
$event['attendees'] = array();
@@ -917,7 +1175,7 @@ class database_driver extends calendar_driver
$event['valarms'] = $this->unserialize_alarms($event['alarms']);
}
- unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['_attachments']);
+ unset($event['event_id'], $event['calendar_id'], $event['notifyat'], $event['all_day'], $event['instance'], $event['_attachments']);
return $event;
}
@@ -1172,6 +1430,32 @@ class database_driver extends calendar_driver
}
/**
+ * Helper method to decode the attendees list from string
+ */
+ private function unserialize_attendees($s_attendees)
+ {
+ $attendees = array();
+
+ // decode json serialized string
+ if ($s_attendees[0] == '[') {
+ $attendees = json_decode($s_attendees, true);
+ }
+ // decode the old serialization format
+ else {
+ foreach (explode("\n", $event['attendees']) as $line) {
+ $att = array();
+ foreach (rcube_utils::explode_quoted_string(';', $line) as $prop) {
+ list($key, $value) = explode("=", $prop);
+ $att[strtolower($key)] = stripslashes(trim($value, '""'));
+ }
+ $attendees[] = $att;
+ }
+ }
+
+ return $attendees;
+ }
+
+ /**
* Handler for user_delete plugin hook
*/
public function user_delete($args)
diff --git a/plugins/calendar/drivers/kolab/kolab_driver.php b/plugins/calendar/drivers/kolab/kolab_driver.php
index 1bd8caf..410dc7a 100644
--- a/plugins/calendar/drivers/kolab/kolab_driver.php
+++ b/plugins/calendar/drivers/kolab/kolab_driver.php
@@ -621,6 +621,7 @@ class kolab_driver extends calendar_driver
*
* @param array Hash array with event properties
* @param string New participant status
+ * @param array List of hash arrays with updated attendees
* @return boolean True on success, False on error
*/
public function edit_rsvp(&$event, $status, $attendees)
@@ -634,21 +635,23 @@ class kolab_driver extends calendar_driver
$update_event['_savemode'] = $event['_savemode'];
$update_event['id'] = $update_event['uid'];
unset($update_event['recurrence_id']);
- self::merge_attendee_data($update_event, $attendees);
+ calendar::merge_attendee_data($update_event, $attendees);
}
}
- if (($ret = $this->update_attendees($update_event, $attendees)) && $this->rc->config->get('kolab_invitation_calendars')) {
+ if ($ret = $this->update_attendees($update_event, $attendees)) {
// replace with master event (for iTip reply)
$event = self::to_rcube_event($update_event);
// re-assign to the according (virtual) calendar
- if (strtoupper($status) == 'DECLINED')
- $event['calendar'] = self::INVITATIONS_CALENDAR_DECLINED;
- else if (strtoupper($status) == 'NEEDS-ACTION')
- $event['calendar'] = self::INVITATIONS_CALENDAR_PENDING;
- else if ($event['_folder_id'])
- $event['calendar'] = $event['_folder_id'];
+ if ($this->rc->config->get('kolab_invitation_calendars')) {
+ if (strtoupper($status) == 'DECLINED')
+ $event['calendar'] = self::INVITATIONS_CALENDAR_DECLINED;
+ else if (strtoupper($status) == 'NEEDS-ACTION')
+ $event['calendar'] = self::INVITATIONS_CALENDAR_PENDING;
+ else if ($event['_folder_id'])
+ $event['calendar'] = $event['_folder_id'];
+ }
}
return $ret;
@@ -675,7 +678,7 @@ class kolab_driver extends calendar_driver
foreach ($master['recurrence']['EXCEPTIONS'] as $i => $exception) {
// merge the new event properties onto future exceptions
if ($exception['_instance'] >= strval($event['_instance'])) {
- self::merge_attendee_data($master['recurrence']['EXCEPTIONS'][$i], $attendees);
+ calendar::merge_attendee_data($master['recurrence']['EXCEPTIONS'][$i], $attendees);
}
// update a specific instance
if ($exception['_instance'] == $event['_instance'] && $exception['thisandfuture']) {
@@ -1164,7 +1167,7 @@ class kolab_driver extends calendar_driver
$removed_attendees = array_diff($old_attendees, $current_attendees);
foreach ($event['recurrence']['EXCEPTIONS'] as $i => $exception) {
- self::merge_attendee_data($event['recurrence']['EXCEPTIONS'][$i], $added_attendees, $removed_attendees);
+ calendar::merge_attendee_data($event['recurrence']['EXCEPTIONS'][$i], $added_attendees, $removed_attendees);
}
// adjust recurrence-id when start changed and therefore the entire recurrence chain changes
@@ -1281,7 +1284,7 @@ class kolab_driver extends calendar_driver
self::merge_exception_data($master['recurrence']['EXCEPTIONS'][$i], $event, array('attendees'));
if (!empty($added_attendees) || !empty($removed_attendees)) {
- self::merge_attendee_data($master['recurrence']['EXCEPTIONS'][$i], $added_attendees, $removed_attendees);
+ calendar::merge_attendee_data($master['recurrence']['EXCEPTIONS'][$i], $added_attendees, $removed_attendees);
}
}
}
@@ -1407,42 +1410,6 @@ class kolab_driver extends calendar_driver
}
/**
- * Update attendee properties on the given event object
- *
- * @param array The event object to be altered
- * @param array List of hash arrays each represeting an updated/added attendee
- */
- public static function merge_attendee_data(&$event, $attendees, $removed = null)
- {
- if (!empty($attendees) && !is_array($attendees[0])) {
- $attendees = array($attendees);
- }
-
- foreach ($attendees as $attendee) {
- $found = false;
-
- foreach ($event['attendees'] as $i => $candidate) {
- if ($candidate['email'] == $attendee['email']) {
- $event['attendees'][$i] = $attendee;
- $found = true;
- break;
- }
- }
-
- if (!$found) {
- $event['attendees'][] = $attendee;
- }
- }
-
- // filter out removed attendees
- if (!empty($removed)) {
- $event['attendees'] = array_filter($event['attendees'], function($attendee) use ($removed) {
- return !in_array($attendee['email'], $removed);
- });
- }
- }
-
- /**
* Get events from source.
*
* @param integer Event's new start (unix timestamp)