extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-03 12:39:25 +01:00
Code Issues Packages Projects Releases Wiki Activity

Handle multiple attachments with the same name when downloading attachments from an email into vfs

Browse Source
This commit is contained in:
Nathan Gray 2015-10-26 19:25:01 +00:00
parent 035570018a
commit 5aaadfd00d
1 changed files with 16 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2487,6 +2487,7 @@ class mail_ui
return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); egw(window).close();';
}
$err=null;
$dupe_count = array();
$rememberServerID = $this->mail_bo->profileID;
foreach((array)$ids as $id)
{
@ -2504,13 +2505,27 @@ class mail_ui
//error_log(__METHOD__.__LINE__.array2string($hA));
$this->mail_bo->reopen($mailbox);
$attachment = $this->mail_bo->getAttachment($uid,$part,$is_winmail,false);
$file = $name;
while(egw_vfs::file_exists($path.($file ? '/'.$file : '')))
{
$dupe_count[$name]++;
$file = pathinfo($name, PATHINFO_FILENAME) .
' ('.($dupe_count[$name] + 1).')' . '.' .
pathinfo($name, PATHINFO_EXTENSION);
}
$name = $file;
//error_log(__METHOD__.__LINE__.array2string($attachment));
if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) ||
!fwrite($fp,$attachment['attachment']))
{
$err .= lang('Error saving %1!',$file);
}
if ($fp) fclose($fp);
if ($fp)
{
fclose($fp);
$file_list[] = $name;
}
}
$this->mail_bo->closeConnection();
if ($rememberServerID != $this->mail_bo->profileID)