holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Handle multiple attachments with the same name when downloading attachments from an email as a zip

Browse Source
This commit is contained in:
Nathan Gray 2015-10-19 23:45:38 +00:00
parent 8339db86d2
commit bb880a6c67
1 changed files with 8 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2567,12 +2567,20 @@ class mail_ui
}
$file_list = array();
$dupe_count = array();
$this->mail_bo->reopen($mailbox);
foreach($attachments as $file)
{
$attachment = $this->mail_bo->getAttachment($message_id,$file['partID'],$file['is_winmail'],false,true);
$success=true;
if (empty($file['filename'])) $file['filename'] = $file['name'];
if(in_array($path.$file['filename'], $file_list))
{
$dupe_count[$path.$file['filename']]++;
$file['filename'] = pathinfo($file['filename'], PATHINFO_FILENAME) .
' ('.($dupe_count[$path.$file['filename']] + 1).')' . '.' .
pathinfo($file['filename'], PATHINFO_EXTENSION);
}
if (!($fp = egw_vfs::fopen($path.$file['filename'],'wb')) ||
!(!fseek($attachment['attachment'], 0, SEEK_SET) && stream_copy_to_stream($attachment['attachment'], $fp)))
{