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

Fix loading attachments for events listed in virtual calendars (#4400)

Browse source
This commit is contained in:
Thomas Bruederli 2015-02-24 12:49:05 +01:00
parent 055c5aff13
commit a837feb76e
4 changed files with 52 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
plugins/calendar/drivers/kolab/kolab_calendar.php
View file

@ -207,6 +207,14 @@ class kolab_calendar extends kolab_storage_folder_api
return $this->events[$id];
}
/**
* Get attachment body
* @see calendar_driver::get_attachment_body()
*/
public function get_attachment_body($id, $event)
{
return $this->ready ? $this->storage->get_attachment($event['id'], $id): false;
}
/**
* @param integer Event's new start (unix timestamp)

11
plugins/calendar/drivers/kolab/kolab_driver.php
View file

@ -583,15 +583,6 @@ class kolab_driver extends calendar_driver
$cid = $event['calendar'] ? $event['calendar'] : reset(array_keys($this->calendars));
if ($storage = $this->get_calendar($cid)) {
// handle attachments to add
if (!empty($event['attachments'])) {
foreach ($event['attachments'] as $idx => $attachment) {
// we'll read file contacts into memory, Horde/Kolab classes does the same
// So we cannot save memory, rcube_imap class can do this better
$event['attachments'][$idx]['content'] = $attachment['data'] ? $attachment['data'] : file_get_contents($attachment['path']);
}
}
$success = $storage->insert_event($event);
if ($success && $this->freebusy_trigger) {
@ -1614,7 +1605,7 @@ class kolab_driver extends calendar_driver
if (!($cal = $this->get_calendar($event['calendar'])))
return false;
return $cal->storage->get_attachment($event['id'], $id);
return $cal->get_attachment_body($id, $event);
}
/**

27
plugins/calendar/drivers/kolab/kolab_invitation_calendar.php
View file

@ -188,6 +188,33 @@ class kolab_invitation_calendar
return $event;
}
/**
* Get attachment body
* @see calendar_driver::get_attachment_body()
*/
public function get_attachment_body($id, $event)
{
// find the actual folder this event resides in
if (!empty($event['_folder_id'])) {
$cal = $this->cal->get_calendar($event['_folder_id']);
}
else {
$cal = null;
foreach (kolab_storage::list_folders('', '*', 'event', null) as $foldername) {
$cal = new kolab_calendar($foldername, $this->cal);
if ($cal->ready && $cal->storage && $cal->get_event($event['id'])) {
break;
}
}
}
if ($cal && $cal->storage) {
return $cal->get_attachment_body($id, $event);
}
return false;
}
/**
* @param integer Event's new start (unix timestamp)

16
plugins/calendar/drivers/kolab/kolab_user_calendar.php
View file

@ -174,6 +174,22 @@ class kolab_user_calendar extends kolab_calendar
return $this->events[$id];
}
/**
* Get attachment body
* @see calendar_driver::get_attachment_body()
*/
public function get_attachment_body($id, $event)
{
if (!$event['calendar'] && ($ev = $this->get_event($event['id']))) {
$event['calendar'] = $ev['calendar'];
}
if ($event['calendar'] && ($cal = $this->cal->get_calendar($event['calendar']))) {
return $cal->get_attachment_body($id, $event);
}
return false;
}
/**
* @param integer Event's new start (unix timestamp)