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

simplyfy attachment loops, as we do not have to distinguish between attachments and attached message/rfc anymore

Browse Source
This commit is contained in:
Klaus Leithoff 2015-05-12 12:24:27 +00:00
parent a9c66335e7
commit 5cd3972ae3
1 changed files with 7 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
mail/inc/class.mail_activesync.inc.php
View File

@ -732,21 +732,10 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
{
if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
$attachmentNames .= $attachment['name']."\n";
switch(strtoupper($attachment['mimeType']))
{
case 'MESSAGE/RFC822':
$rawHeader = $rawBody = '';
$rawHeader = $this->mail->getMessageRawHeader($uid, $attachment['partID'],$folder);
$rawBody = $this->mail->getMessageRawBody($uid, $attachment['partID'],$folder);
$mailObject->AddStringAttachment($rawHeader.$rawBody, $mailObject->EncodeHeader($attachment['name']), 'message/rfc822');
break;
default:
$attachmentData = '';
$attachmentData = $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
//debugLog(__METHOD__.__LINE__.' added part with number:'.$x);
break;
}
$attachmentData = '';
$attachmentData = $this->mail->getAttachment($uid, $attachment['partID'],0,false,false,$folder);
/*$x =*/ $mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
//debugLog(__METHOD__.__LINE__.' added part with number:'.$x);
}
}
}
@ -1080,23 +1069,9 @@ class mail_activesync implements activesync_plugin_write, activesync_plugin_send
foreach((array)$attachments as $key => $attachment)
{
if ($this->debugLevel>0) debugLog(__METHOD__.__LINE__.' Key:'.$key.'->'.array2string($attachment));
switch($attachment['type'])
{
case 'MESSAGE/RFC822':
$rawHeader = $rawBody = '';
if (isset($attachment['partID']))
{
$rawHeader = $this->mail->getMessageRawHeader($id, $attachment['partID'],$_folderName);
}
$rawBody = $this->mail->getMessageRawBody($id, $attachment['partID'],$_folderName);
$mailObject->AddStringAttachment($rawHeader.$rawBody, $mailObject->EncodeHeader($attachment['name']), '7bit', 'message/rfc822');
break;
default:
$attachmentData = '';
$attachmentData = $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), 'base64', $attachment['mimeType']);
break;
}
$attachmentData = '';
$attachmentData = $this->mail->getAttachment($id, $attachment['partID'],0,false,false,$_folderName);
$mailObject->AddStringAttachment($attachmentData['attachment'], $mailObject->EncodeHeader($attachment['name']), $attachment['mimeType']);
}
}