extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-22 23:00:56 +01:00
Code Issues Packages Projects Releases Wiki Activity

fix handling of inline attachments, still open is that inline attachments are one byte short when send to device and therefore dont display!

Browse Source
This commit is contained in:
Ralf Becker 2015-09-07 12:59:19 +00:00
parent 472636c32c
commit ded1a651d9
1 changed files with 8 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
mail/inc/class.mail_zpush.inc.php
View File

@ -1250,7 +1250,10 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
$attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : ""; $attachment->attoid = "";//isset($part->headers['content-id']) ? trim($part->headers['content-id']) : "";
if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' ) if (!empty($attach['cid']) && $attach['cid'] <> 'NIL' )
{ {
$attachment->isinline=true; if ($bpReturnType != 4 && $attach['disposition'] == 'inline')
{
$attachment->isinline = true;
}
if (Request::GetProtocolVersion() >= 12.0) { if (Request::GetProtocolVersion() >= 12.0) {
$attachment->method=1; $attachment->method=1;
$attachment->contentid= str_replace(array("<",">"), "",$attach['cid']); $attachment->contentid= str_replace(array("<",">"), "",$attach['cid']);
@ -1344,9 +1347,9 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true); if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
$this->mail->reopen($folder); $this->mail->reopen($folder);
$attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder); $attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
$SIOattachment = new SyncItemOperationsAttachment(); $SIOattachment = new SyncItemOperationsAttachment();
$SIOattachment->data = StringStreamWrapper::Open($attachment['attachment']); $SIOattachment->data = $attachment['attachment'];
if (isset($attachment['type']) ) if (isset($attachment['type']) )
$SIOattachment->contenttype = $attachment['type']; $SIOattachment->contenttype = $attachment['type'];
@ -1375,9 +1378,9 @@ class mail_zpush implements activesync_plugin_write, activesync_plugin_sendmail,
if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true); if (!isset($this->mail)) $this->mail = mail_bo::getInstance(false,self::$profileID,true,false,true);
$this->mail->reopen($folder); $this->mail->reopen($folder);
$attachment = $this->mail->getAttachment($id,$part,0,false,false,$folder); $attachment = $this->mail->getAttachment($id,$part,0,false,true,$folder);
$SIOattachment = new SyncItemOperationsAttachment(); $SIOattachment = new SyncItemOperationsAttachment();
$SIOattachment->data = StringStreamWrapper::Open($attachment['attachment']); $SIOattachment->data = $attachment['attachment'];
if (isset($attachment['type']) ) if (isset($attachment['type']) )
$SIOattachment->contenttype = $attachment['type']; $SIOattachment->contenttype = $attachment['type'];