extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-18 04:31:06 +01:00
Code Issues Packages Projects Releases Wiki Activity

detect TNEF by either its mime-type or caseinsensitive filename of winmail.dat

Browse Source
This commit is contained in:
Ralf Becker 2014-10-01 16:35:20 +00:00
parent 814400e861
commit 0b9c86328c
1 changed files with 3 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
emailadmin/inc/class.emailadmin_imapbase.inc.php
View File

@ -1486,9 +1486,8 @@ class emailadmin_imapbase
$headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid; $headerObject['ATTACHMENTS'][$mime_id]['cid'] = $cid;
$headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id; $headerObject['ATTACHMENTS'][$mime_id]['partID']=$mime_id;
if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName(); if (!isset($headerObject['ATTACHMENTS'][$mime_id]['name']))$headerObject['ATTACHMENTS'][$mime_id]['name']=$part->getName();
if ($headerObject['ATTACHMENTS'][$mime_id]['name']=='winmail.dat' && if (strcasecmp($headerObject['ATTACHMENTS'][$mime_id]['name'],'winmail.dat') ||
($headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/octet-stream' || $headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef')
$headerObject['ATTACHMENTS'][$mime_id]['mimeType']=='application/ms-tnef'))
{ {
$tnefResolved=false; $tnefResolved=false;
$tnef_data = $this->getAttachment($headerObject['ATTACHMENTS'][$mime_id]['uid'],$headerObject['ATTACHMENTS'][$mime_id]['partID'],0,false); $tnef_data = $this->getAttachment($headerObject['ATTACHMENTS'][$mime_id]['uid'],$headerObject['ATTACHMENTS'][$mime_id]['partID'],0,false);
@ -4866,7 +4865,7 @@ class emailadmin_imapbase
//error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment)); //error_log(__METHOD__.' ('.__LINE__.') '.' Uid:'.$uid.' Part:'.$_partID.'->'.$mime_id.':'.array2string($attachment));
//typical winmail.dat attachment is //typical winmail.dat attachment is
//Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat) //Array([size] => 1462762[filename] => winmail.dat[mimeType] => application/ms-tnef[uid] => 100[partID] => 2[name] => winmail.dat)
if ($resolveTNEF && $attachment['mimeType']=='application/ms-tnef') if ($resolveTNEF && ($attachment['mimeType']=='application/ms-tnef' || !strcasecmp($attachment['name'],'winmail.dat')))
{ {
$tnefParts[] = $attachment; $tnefParts[] = $attachment;
} }