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

Fix Content-Type strings for files and notes; accept application/vnd.kolab+xml when searching for xml part

Browse source
This commit is contained in:
Thomas Bruederli 2014-03-27 19:20:22 +01:00
parent c6b5283180
commit 6b1de94b51
3 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
plugins/libkolab/lib/kolab_format_file.php
View file

@ -25,7 +25,7 @@
class kolab_format_file extends kolab_format class kolab_format_file extends kolab_format
{ {
public $CTYPE = 'application/x-vnd.kolab.file'; public $CTYPE = 'application/vnd.kolab+xml';
protected $objclass = 'File'; protected $objclass = 'File';
protected $read_func = 'kolabformat::readKolabFile'; protected $read_func = 'kolabformat::readKolabFile';

2
plugins/libkolab/lib/kolab_format_note.php
View file

@ -24,7 +24,7 @@
class kolab_format_note extends kolab_format class kolab_format_note extends kolab_format
{ {
public $CTYPE = 'application/x-vnd.kolab.note'; public $CTYPE = 'application/vnd.kolab+xml';
public $CTYPEv2 = 'application/x-vnd.kolab.note'; public $CTYPEv2 = 'application/x-vnd.kolab.note';
protected $objclass = 'Note'; protected $objclass = 'Note';

2
plugins/libkolab/lib/kolab_storage_folder.php
View file

@ -578,7 +578,7 @@ class kolab_storage_folder
// get XML part // get XML part
foreach ((array)$message->attachments as $part) { foreach ((array)$message->attachments as $part) {
if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z]+\+)?xml!', $part->mimetype))) { if (!$xml && ($part->mimetype == $content_type || preg_match('!application/([a-z.]+\+)?xml!', $part->mimetype))) {
$xml = $part->body ? $part->body : $message->get_part_content($part->mime_id); $xml = $part->body ? $part->body : $message->get_part_content($part->mime_id);
} }
else if ($part->filename || $part->content_id) { else if ($part->filename || $part->content_id) {