extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-02-16 18:31:26 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem saving to vfs (mail/attachment) -> window.close; now using egw_framework::window_close

Browse Source
This commit is contained in:
Klaus Leithoff 2014-02-14 14:09:56 +00:00
parent 5e0ac9b76f
commit 20632a0422
1 changed files with 8 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -2562,10 +2562,11 @@ unset($query['actions']);
$mailbox = $hA['folder']; $mailbox = $hA['folder'];
if ($mb != $this->mail_bo->mailbox) $this->mail_bo->reopen($mb = $mailbox); if ($mb != $this->mail_bo->mailbox) $this->mail_bo->reopen($mb = $mailbox);
$message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox); $message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox);
$err=null;
if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) || if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) ||
!fwrite($fp,$message)) !fwrite($fp,$message))
{ {
$err .= 'alert("'.addslashes(lang('Error saving %1!',$file)).'");'; $err .= lang('Error saving %1!',$file);
$succeeded = false; $succeeded = false;
} }
else else
@ -2584,8 +2585,8 @@ unset($query['actions']);
} }
} }
//$this->mail_bo->closeConnection(); //$this->mail_bo->closeConnection();
egw_framework::window_close(($err?$err:null));
return $err.'window.close();'; //return $err.'window.close();';
} }
/** /**
@ -2603,6 +2604,7 @@ unset($query['actions']);
{ {
return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); window.close();'; return 'alert("'.addslashes(lang('%1 is NOT writable by you!',$path)).'"); window.close();';
} }
$err=null;
foreach((array)$ids as $id) foreach((array)$ids as $id)
{ {
list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8); list($app,$user,$serverID,$mailbox,$uid,$part,$is_winmail,$name) = explode('::',$id,8);
@ -2617,13 +2619,13 @@ unset($query['actions']);
if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) || if (!($fp = egw_vfs::fopen($file=$path.($name ? '/'.$name : ''),'wb')) ||
!fwrite($fp,$attachment['attachment'])) !fwrite($fp,$attachment['attachment']))
{ {
$err .= 'alert("'.addslashes(lang('Error saving %1!',$file)).'");'; $err .= lang('Error saving %1!',$file);
} }
if ($fp) fclose($fp); if ($fp) fclose($fp);
} }
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
egw_framework::window_close(($err?$err:null));
return $err.'window.close();'; //return $err.'window.close();';
} }