banananetwork
/
roundcubemail
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

#1485616: read content-id/content-location only for multipart/related type

Browse Source
release-0.6
alecpl 16 years ago
parent b7548893a7
commit 9e8a1756b7
1 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File

22
program/include/rcube_message.php
Unescape Escape View File

@ -350,7 +350,7 @@ class rcube_message
$mail_part->type = 'content';
$this->parts[] = $mail_part;
}
// list as attachment as well
if (!empty($mail_part->filename))
$this->attachments[] = $mail_part;
@ -373,16 +373,18 @@ class rcube_message
// skip apple resource forks
if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
continue;
if ($message_ctype_secondary == 'related' && $mail_part->headers['content-id'])
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
if ($message_ctype_secondary == 'related' && $mail_part->headers['content-location'])
$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
// part belongs to a related message
if ($mail_part->content_id || $mail_part->content_location) {
$this->inline_parts[] = $mail_part;
}
if ($message_ctype_secondary == 'related') {
if ($mail_part->headers['content-id'])
$mail_part->content_id = preg_replace(array('/^</', '/>$/'), '', $mail_part->headers['content-id']);
if ($mail_part->headers['content-location'])
$mail_part->content_location = $mail_part->headers['content-base'] . $mail_part->headers['content-location'];
if ($mail_part->content_id || $mail_part->content_location) {
$this->inline_parts[] = $mail_part;
}
}
// is regular attachment
else {
if (!$mail_part->filename)

Write Preview
Loading…
Cancel
Save