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

Handle attachments and links for all xcal-based objects

Browse source
This commit is contained in:
Thomas Bruederli 2013-07-24 18:59:57 +02:00
parent 17dbcd9c9f
commit f15a3feeb4
2 changed files with 40 additions and 40 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

40
plugins/libkolab/lib/kolab_format_event.php
View file

@ -89,25 +89,6 @@ class kolab_format_event extends kolab_format_xcal
$status = kolabformat::StatusCancelled; $status = kolabformat::StatusCancelled;
$this->obj->setStatus($status); $this->obj->setStatus($status);
// save attachments
$vattach = new vectorattachment;
foreach ((array)$object['_attachments'] as $cid => $attr) {
if (empty($attr))
continue;
$attach = new Attachment;
$attach->setLabel((string)$attr['name']);
$attach->setUri('cid:' . $cid, $attr['mimetype']);
$vattach->push($attach);
}
foreach ((array)$object['links'] as $link) {
$attach = new Attachment;
$attach->setUri($link, null);
$vattach->push($attach);
}
$this->obj->setAttachments($vattach);
// save recurrence exceptions // save recurrence exceptions
if ($object['recurrence']['EXCEPTIONS']) { if ($object['recurrence']['EXCEPTIONS']) {
$vexceptions = new vectorevent; $vexceptions = new vectorevent;
@ -170,27 +151,6 @@ class kolab_format_event extends kolab_format_xcal
else if ($status == kolabformat::StatusCancelled) else if ($status == kolabformat::StatusCancelled)
$object['cancelled'] = true; $object['cancelled'] = true;
// handle attachments
$vattach = $this->obj->attachments();
for ($i=0; $i < $vattach->size(); $i++) {
$attach = $vattach->get($i);
// skip cid: attachments which are mime message parts handled by kolab_storage_folder
if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
$name = $attach->label();
$content = $attach->data();
$object['_attachments'][$name] = array(
'name' => $name,
'mimetype' => $attach->mimetype(),
'size' => strlen($content),
'content' => $content,
);
}
else if (substr($attach->uri(), 0, 4) == 'http') {
$object['links'][] = $attach->uri();
}
}
// read exception event objects // read exception event objects
if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) { if (($exceptions = $this->obj->exceptions()) && is_object($exceptions) && $exceptions->size()) {
for ($i=0; $i < $exceptions->size(); $i++) { for ($i=0; $i < $exceptions->size(); $i++) {

40
plugins/libkolab/lib/kolab_format_xcal.php
View file

@ -218,6 +218,27 @@ abstract class kolab_format_xcal extends kolab_format
} }
} }
// handle attachments
$vattach = $this->obj->attachments();
for ($i=0; $i < $vattach->size(); $i++) {
$attach = $vattach->get($i);
// skip cid: attachments which are mime message parts handled by kolab_storage_folder
if (substr($attach->uri(), 0, 4) != 'cid:' && $attach->label()) {
$name = $attach->label();
$content = $attach->data();
$object['_attachments'][$name] = array(
'name' => $name,
'mimetype' => $attach->mimetype(),
'size' => strlen($content),
'content' => $content,
);
}
else if (substr($attach->uri(), 0, 4) == 'http') {
$object['links'][] = $attach->uri();
}
}
return $object; return $object;
} }
@ -379,6 +400,25 @@ abstract class kolab_format_xcal extends kolab_format
$valarms->push($alarm); $valarms->push($alarm);
} }
$this->obj->setAlarms($valarms); $this->obj->setAlarms($valarms);
// save attachments
$vattach = new vectorattachment;
foreach ((array)$object['_attachments'] as $cid => $attr) {
if (empty($attr))
continue;
$attach = new Attachment;
$attach->setLabel((string)$attr['name']);
$attach->setUri('cid:' . $cid, $attr['mimetype']);
$vattach->push($attach);
}
foreach ((array)$object['links'] as $link) {
$attach = new Attachment;
$attach->setUri($link, 'unknown');
$vattach->push($attach);
}
$this->obj->setAttachments($vattach);
} }
/** /**