extern/egroupware
1
0
Fork 1
mirror of https://github.com/EGroupware/egroupware.git synced 2025-01-28 08:49:00 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix problem regarding: uploaded eml files where not handled as message/rfc

Browse Source
This commit is contained in:
Klaus Leithoff 2014-12-05 11:14:42 +00:00
parent 14230d10f7
commit 3102bf88fa
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
mail/inc/class.mail_compose.inc.php
View File

@ -1616,6 +1616,7 @@ class mail_compose
egw_framework::message($e->getMessage(), 'error'); egw_framework::message($e->getMessage(), 'error');
} }
//error_log(__METHOD__.__LINE__.array2string($tmpFileName)); //error_log(__METHOD__.__LINE__.array2string($tmpFileName));
//error_log(__METHOD__.__LINE__.array2string($_formData));
if ($eliminateDoubleAttachments == true) if ($eliminateDoubleAttachments == true)
{ {
@ -2152,7 +2153,7 @@ class mail_compose
} }
$_mailObject->setBody($body); $_mailObject->setBody($body);
} }
//error_log(__METHOD__.__LINE__.array2string($_formData['attachments']));
// add the attachments // add the attachments
if (is_array($_formData) && isset($_formData['attachments'])) if (is_array($_formData) && isset($_formData['attachments']))
{ {
@ -2178,14 +2179,15 @@ class mail_compose
$connection_opened = true; $connection_opened = true;
} }
$mail_bo->reopen($attachment['folder']); $mail_bo->reopen($attachment['folder']);
switch($attachment['type']) { switch(strtoupper($attachment['type'])) {
case 'MESSAGE/RFC':
case 'MESSAGE/RFC822': case 'MESSAGE/RFC822':
$rawHeader=''; $rawHeader='';
if (isset($attachment['partID'])) { if (isset($attachment['partID'])) {
$rawHeader = $mail_bo->getMessageRawHeader($attachment['uid'], $attachment['partID'],$attachment['folder']); $rawHeader = $mail_bo->getMessageRawHeader($attachment['uid'], $attachment['partID'],$attachment['folder']);
} }
$rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']); $rawBody = $mail_bo->getMessageRawBody($attachment['uid'], $attachment['partID'],$attachment['folder']);
$_mailObject->AddStringAttachment($rawHeader.$rawBody, $attachment['name'], '7bit', 'message/rfc822'); $_mailObject->addStringAttachment($rawHeader.$rawBody, $attachment['name'], 'message/rfc822');
break; break;
default: default:
$attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false); $attachmentData = $mail_bo->getAttachment($attachment['uid'], $attachment['partID'],0,false);
@ -2203,7 +2205,7 @@ class mail_compose
} }
} }
} }
$_mailObject->AddStringAttachment($attachmentData['attachment'], $attachment['name'], 'base64', $attachment['type']); $_mailObject->addStringAttachment($attachmentData['attachment'], $attachment['name'], $attachment['type']);
break; break;
} }
} }
@ -2218,10 +2220,9 @@ class mail_compose
{ {
$tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']); $tmp_path = $GLOBALS['egw_info']['server']['temp_dir'].SEP.basename($attachment['file']);
} }
$_mailObject->AddAttachment ( $_mailObject->addAttachment (
$tmp_path, $tmp_path,
$attachment['name'], $attachment['name'],
strtoupper($attachment['type'])=='MESSAGE/RFC822' ? '7bit' : 'base64',
$attachment['type'] $attachment['type']
); );
} }
@ -2568,7 +2569,7 @@ class mail_compose
#print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>"; #print "<pre>". $mail->getMessageHeader() ."</pre><hr><br>";
#print "<pre>". $mail->getMessageBody() ."</pre><hr><br>"; #print "<pre>". $mail->getMessageBody() ."</pre><hr><br>";
#exit; #exit;
//error_log(__METHOD__.__LINE__.'#'.array2string($_formData['serverID']).'<serverID<->mailaccount>'.array2string($_formData['mailaccount']));
// we use the authentication data of the choosen mailaccount // we use the authentication data of the choosen mailaccount
if ($_formData['serverID']!=$_formData['mailaccount']) if ($_formData['serverID']!=$_formData['mailaccount'])
{ {