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

W.I.P. of new approach for mail winmail.dat attachment handling

Browse Source 
- Adopt download_zip to new winmail.dat handling
This commit is contained in:
Hadi Nategh 2015-12-02 14:00:34 +00:00
parent 97d240fcab
commit b9c1ed72ce
1 changed files with 17 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
mail/inc/class.mail_ui.inc.php
View File

@ -2640,9 +2640,25 @@ class mail_ui
$file_list = array(); $file_list = array();
$dupe_count = array(); $dupe_count = array();
$this->mail_bo->reopen($mailbox); $this->mail_bo->reopen($mailbox);
if ($attachments[0]['is_winmail'] && $attachments[0]['is_winmail']!='null')
{
$tnefAttachments = $this->mail_bo->getTnefAttachments($message_id, $attachments[0]['partID'],true);
}
foreach($attachments as $file) foreach($attachments as $file)
{ {
$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true); if ($file['is_winmail'])
{
// Try to find the right content for file id
foreach ($tnefAttachments as $key => $val)
{
error_log(__METHOD__.' winmail = '.$key);
if ($key == $file['is_winmail']) $attachment = $val;
}
}
else
{
$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
}
$success=true; $success=true;
if (empty($file['filename'])) $file['filename'] = $file['name']; if (empty($file['filename'])) $file['filename'] = $file['name'];
if(in_array($path.$file['filename'], $file_list)) if(in_array($path.$file['filename'], $file_list))