extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2025-08-15 17:52:36 +02:00
Code Issues Packages Projects Releases Wiki Activity

* Mail/Addressbook/Calendar: add and use charset when sending/receiving mails with vCard/iCals, change default vCard charset preference to utf-8

Browse Source
This commit is contained in:
Ralf Becker
2016-04-29 07:51:13 +00:00
parent b74b3d84f4
commit 0eb3619cd1
10 changed files with 63 additions and 29 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
api/src/Mail.php
View File

@ -5708,11 +5708,10 @@ class Mail
if ($part && ($partDisposition=='attachment' || $partDisposition=='inline' || ($part->getPrimaryType() == 'text' && $part->getSubType() == 'calendar')))
{
//$headerObject=$part->getAllDispositionParameters();//not used anywhere around here
$structure_bytes = $part->getBytes();
$structure_mime=$part->getType();
$structure_partID=$part->getMimeId();
$filename=$part->getName();
//error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
$structure_mime = $part->getType();
$filename = $part->getName();
$charset = $part->getContentTypeParameter('charset');
//$structure_bytes = $part->getBytes(); $structure_partID=$part->getMimeId(); error_log(__METHOD__.__LINE__." fetchPartContents(".array2string($_uid).", $structure_partID, $_stream, $_preserveSeen,$structure_mime)" );
$this->fetchPartContents($_uid, $part, $_stream, $_preserveSeen=true,$structure_mime);
if ($_returnPart) return $part;
}
@ -5727,8 +5726,8 @@ class Mail
}
$attachmentData = array(
'type' => $structure_mime,
'charset' => $charset,
'filename' => $filename,
//'attachment' => $part->getContents(array('stream'=>$_stream))
'attachment' => $part->getContents(array(
// tnef_decode needs strings not a stream
'stream' => $_stream && !($filename == 'winmail.dat' && $_winmail_nr)