fix warning in getMessageRawBody

This commit is contained in:
Klaus Leithoff 2014-02-05 09:24:46 +00:00
parent d8a28da9d3
commit 0c35d75565

View File

@ -2391,8 +2391,8 @@ unset($query['actions']);
$this->mail_bo->reopen($mailbox); $this->mail_bo->reopen($mailbox);
$message = $this->mail_bo->getMessageRawBody($uid, $partID); $message = $this->mail_bo->getMessageRawBody($uid, $partID, $mailbox);
$headers = $this->mail_bo->getMessageHeader($uid, $partID); $headers = $this->mail_bo->getMessageHeader($uid, $partID, true,false, $mailbox);
$this->mail_bo->closeConnection(); $this->mail_bo->closeConnection();
@ -2443,7 +2443,7 @@ unset($query['actions']);
$uid = $hA['msgUID']; $uid = $hA['msgUID'];
$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=''); $message = $this->mail_bo->getMessageRawBody($uid, $partID='', $mailbox);
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))
{ {
@ -2458,7 +2458,7 @@ unset($query['actions']);
if ($succeeded) if ($succeeded)
{ {
translation::add_app('mail'); translation::add_app('mail');
$headers = $this->mail_bo->getMessageHeader($uid,$partID,true); $headers = $this->mail_bo->getMessageHeader($uid,$partID,true,false,$mailbox);
unset($headers['SUBJECT']);//already in filename unset($headers['SUBJECT']);//already in filename
$infoSection = mail_bo::createHeaderInfoSection($headers, 'SUPPRESS', false); $infoSection = mail_bo::createHeaderInfoSection($headers, 'SUPPRESS', false);
$props = array(array('name' => 'comment','val' => $infoSection)); $props = array(array('name' => 'comment','val' => $infoSection));