extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-06-24 11:51:24 +02:00
Code Issues Packages Projects Releases Wiki Activity

fix problem on single file download to vfs

Browse Source
This commit is contained in:
Klaus Leithoff 2016-01-12 15:11:41 +00:00
parent f7ccce8975
commit 535d0db435
1 changed files with 9 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2528,7 +2528,8 @@ class mail_ui
//Examine the first attachment to see if attachment //Examine the first attachment to see if attachment
//is winmail.dat embedded attachments. //is winmail.dat embedded attachments.
$p = $getParams($ids[0]); $isMultipleDownload=is_array($ids);
$p = $getParams((is_array($ids)?$ids[0]:$ids));
if ($p['is_winmail']) if ($p['is_winmail'])
{ {
if ($p['icServer'] && $p['icServer'] != $this->mail_bo->profileID) if ($p['icServer'] && $p['icServer'] != $this->mail_bo->profileID)
@ -2545,6 +2546,8 @@ class mail_ui
foreach((array)$ids as $id) foreach((array)$ids as $id)
{ {
$params = $getParams($id); $params = $getParams($id);
// when downloading a single file, name is not set
if (!$params['name']&&isset($_GET['name'])&&!$isMultipleDownload) $params['name'] = $_GET['name'];
if ($params['icServer'] && $params['icServer'] != $this->mail_bo->profileID) if ($params['icServer'] && $params['icServer'] != $this->mail_bo->profileID)
{ {
//error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID); //error_log(__METHOD__.__LINE__.' change Profile to ->'.$icServerID);
@ -2552,7 +2555,6 @@ class mail_ui
} }
//error_log(__METHOD__.__LINE__.array2string($hA)); //error_log(__METHOD__.__LINE__.array2string($hA));
$this->mail_bo->reopen($params['mailbox']); $this->mail_bo->reopen($params['mailbox']);
if ($params['is_winmail']) if ($params['is_winmail'])
{ {
// Try to find the right content for file id // Try to find the right content for file id
@ -2567,7 +2569,8 @@ class mail_ui
} }
$file = $params['name']; $file = $params['name'];
while(egw_vfs::file_exists($path.($file ? '/'.$file : ''))) // when $isMultipleDownload the path holds no filename
while(egw_vfs::file_exists($path.($file && $isMultipleDownload ? '/'.$file : '')))
{ {
$dupe_count[$params['name']]++; $dupe_count[$params['name']]++;
$file = pathinfo($params['name'], PATHINFO_FILENAME) . $file = pathinfo($params['name'], PATHINFO_FILENAME) .
@ -2576,7 +2579,8 @@ class mail_ui
} }
$params['name'] = $file; $params['name'] = $file;
//error_log(__METHOD__.__LINE__.array2string($attachment)); //error_log(__METHOD__.__LINE__.array2string($attachment));
if (!($fp = egw_vfs::fopen($file=$path.($params['name'] ? '/'.$params['name'] : ''),'wb')) || // when $isMultipleDownload the path holds no filename
if (!($fp = egw_vfs::fopen($file=$path.($params['name'] && $isMultipleDownload ? '/'.$params['name'] : ''),'wb')) ||
!fwrite($fp,$attachment['attachment'])) !fwrite($fp,$attachment['attachment']))
{ {
$err .= lang('Error saving %1!',$file); $err .= lang('Error saving %1!',$file);