Micke/roundcubemail-plugins-kolab
0
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

CalDAV and CardDAV drivers

Browse source 
Summary: CardDAV driver for kolab_addressbook, CalDAV driver for calendar

Reviewers: #roundcube_kolab_plugins_developers

Subscribers: #roundcube_kolab_plugins_developers

Differential Revision: https://git.kolab.org/D3908
This commit is contained in:
Aleksander Machniak 2022-10-16 10:54:01 +02:00
parent 0159e3c115
commit f46ed48258
2 changed files with 1300 additions and 15 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

30
plugins/calendar/drivers/caldav/caldav_calendar.php
View file

@ -372,8 +372,8 @@ class caldav_calendar extends kolab_storage_dav_folder
});
// Apply event-to-mail relations
$config = kolab_storage_config::get_instance();
$config->apply_links($events);
// $config = kolab_storage_config::get_instance();
// $config->apply_links($events);
// avoid session race conditions that will loose temporary subscriptions
$this->cal->rc->session->nowrite = true;
@ -443,8 +443,8 @@ class caldav_calendar extends kolab_storage_dav_folder
}
// email links are stored separately
$links = !empty($event['links']) ? $event['links'] : [];
unset($event['links']);
// $links = !empty($event['links']) ? $event['links'] : [];
// unset($event['links']);
// generate new event from RC input
$object = $this->_from_driver_event($event);
@ -461,9 +461,9 @@ class caldav_calendar extends kolab_storage_dav_folder
}
// save links in configuration.relation object
if ($this->save_links($event['uid'], $links)) {
$object['links'] = $links;
}
// if ($this->save_links($event['uid'], $links)) {
// $object['links'] = $links;
// }
$this->events = [$event['uid'] => $this->_to_driver_event($object, true)];
@ -485,8 +485,8 @@ class caldav_calendar extends kolab_storage_dav_folder
}
// email links are stored separately
$links = !empty($event['links']) ? $event['links'] : [];
unset($event['links']);
// $links = !empty($event['links']) ? $event['links'] : [];
// unset($event['links']);
$object = $this->_from_driver_event($event, $old);
$saved = $this->storage->save($object, 'event', $old['uid']);
@ -501,9 +501,9 @@ class caldav_calendar extends kolab_storage_dav_folder
}
else {
// save links in configuration.relation object
if ($this->save_links($event['uid'], $links)) {
$object['links'] = $links;
}
// if ($this->save_links($event['uid'], $links)) {
// $object['links'] = $links;
// }
$updated = true;
$this->events = [$event['uid'] => $this->_to_driver_event($object, true)];
@ -737,9 +737,9 @@ class caldav_calendar extends kolab_storage_dav_folder
// remove (possibly outdated) cached parameters
unset($record['_folder_id'], $record['className']);
if ($links && !array_key_exists('links', $record)) {
$record['links'] = $this->get_links($record['uid']);
}
// if ($links && !array_key_exists('links', $record)) {
// $record['links'] = $this->get_links($record['uid']);
// }
$ns = $this->get_namespace();

1285
plugins/kolab_addressbook/lib/rcube_carddav_contacts.php Normal file
View file

File diff suppressed because it is too large Load diff