diff --git a/include/tnef_decoder.php b/include/tnef_decoder.php index 3b8b204a51a86c844458b6a5d120ed3fa550edca..fdcdba818993f5cefca49ed22aa6ff4729ce1266 100644 --- a/include/tnef_decoder.php +++ b/include/tnef_decoder.php @@ -215,6 +215,7 @@ class TnefAttribute { const AttachFilename = 0x3704; const AttachLongFilename = 0x3707; const AttachPathname = 0x3708; + const AttachTransportName = 0x370c; const AttachMimeTag = 0x370e; # Mime content-type const AttachContentId = 0x3712; const AttachmentCharset = 0x371b; @@ -486,7 +487,7 @@ class TnefStreamParser { new TnefAttributeStreamReader($info['data'])); break; case self::attAttachTransportFilename: - $attach->_setFilename($info['data']); + $attach->_setFilename(rtrim($info['data'], "\x00")); break; case self::attAttachData: $attach->_setData($info['data']); @@ -576,6 +577,8 @@ class TnefAttachment extends AbstractTnefObject { return basename($this->AttachLongFilename); elseif (isset($this->AttachFilename)) return $this->AttachFilename; + elseif (isset($this->AttachTransportName)) + return $this->AttachTransportName; else return $this->TransportFilename; }