extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-11-15 20:44:28 +01:00
Code Issues Packages Projects Releases Wiki Activity

S/MIME:

Browse Source 
- Encode saved mail into sent folder with ENCODE_7bit to avoid any changes.
- Fix signed mails in sent folder not being correctly verified after.
This commit is contained in:
Hadi Nategh 2017-09-04 12:39:58 +02:00
parent 4d8efd0c4a
commit 36991cb80b
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
api/src/Mailer.php
View File

@ -789,12 +789,16 @@ class Mailer extends Horde_Mime_Mail
// code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in // code copied from Horde_Mime_Mail::getRaw(), as there is no way to inject charset in
// _headers->toString(), which is required to encode headers containing non-ascii chars correct // _headers->toString(), which is required to encode headers containing non-ascii chars correct
if ($stream) { if ($stream) {
// Smime sign needs to be 7bit encoded to avoid any changes
$encode = $this->_base && $this->_base->getMetadata('X-EGroupware-Smime-signed')?
Horde_Mime_Part::ENCODE_7BIT :
(Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY);
$hdr = new Horde_Stream(); $hdr = new Horde_Stream();
$hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true); $hdr->add($this->_headers->toString(array('charset' => 'utf-8', 'canonical' => true)), true);
return Horde_Stream_Wrapper_Combine::getStream( return Horde_Stream_Wrapper_Combine::getStream(
array($hdr->stream, array($hdr->stream,
$this->getBasePart()->toString( $this->getBasePart()->toString(
array('stream' => true, 'canonical' => true, 'encode' => Horde_Mime_Part::ENCODE_7BIT | Horde_Mime_Part::ENCODE_8BIT | Horde_Mime_Part::ENCODE_BINARY)) array('stream' => true, 'canonical' => true, 'encode' => $encode))
) )
); );
} }