alecpl
2009-07-06 b0d56e93f542a348b0695705dcae3b07fa2fea09
- simple fix for malformed Content-Disposition (#1485965)


1 files modified
9 ■■■■■ changed files
program/include/rcube_message.php 9 ●●●●● patch | view | raw | blame | history
program/include/rcube_message.php
@@ -366,7 +366,7 @@
        else if ($primary_type == 'protocol')
          continue;
          
        // part is Microsoft outlook TNEF (winmail.dat)
        // part is Microsoft Outlook TNEF (winmail.dat)
        else if ($primary_type == 'application' && $secondary_type == 'ms-tnef') {
          foreach ((array)$this->imap->tnef_decode($mail_part, $structure->headers['uid']) as $tnef_part) {
            $this->mime_parts[$tnef_part->mime_id] = $tnef_part;
@@ -374,9 +374,10 @@
          }
        }
        // part is file/attachment
        else if ($mail_part->disposition == 'attachment' || $mail_part->disposition == 'inline' ||
        // part is a file/attachment
        else if (preg_match('/^(inline|attach)/', $mail_part->disposition) ||
                 $mail_part->headers['content-id'] || (empty($mail_part->disposition) && $mail_part->filename)) {
          // skip apple resource forks
          if ($message_ctype_secondary == 'appledouble' && $secondary_type == 'applefile')
            continue;
@@ -392,7 +393,7 @@
              $this->inline_parts[] = $mail_part;
            }
          }
          // is regular attachment
          // is a regular attachment
          else {
            if (!$mail_part->filename)
              $mail_part->filename = 'Part '.$mail_part->mime_id;