holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

* Mail: fix signed/encrypted S/MIME new message does not take CC or BCC fields into account

Browse Source
This commit is contained in:
Hadi Nategh 2018-09-17 11:08:52 +02:00
parent c98c0df888
commit 69b84928a1
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -3121,6 +3121,7 @@ class mail_compose
// SMIME SIGN/ENCRYPTION // SMIME SIGN/ENCRYPTION
if ($_formData['smime_sign'] == 'on' || $_formData['smime_encrypt'] == 'on' ) if ($_formData['smime_sign'] == 'on' || $_formData['smime_encrypt'] == 'on' )
{ {
$recipients = array_merge($_formData['to'], (array) $_formData['cc'], (array) $_formData['bcc']);
try { try {
if ($_formData['smime_sign'] == 'on') if ($_formData['smime_sign'] == 'on')
{ {
@ -3135,7 +3136,7 @@ class mail_compose
$smime_success = $this->_encrypt( $smime_success = $this->_encrypt(
$mail, $mail,
$_formData['smime_encrypt'] == 'on'? Mail\Smime::TYPE_SIGN_ENCRYPT: Mail\Smime::TYPE_SIGN, $_formData['smime_encrypt'] == 'on'? Mail\Smime::TYPE_SIGN_ENCRYPT: Mail\Smime::TYPE_SIGN,
Mail::stripRFC822Addresses($_formData['to']), Mail::stripRFC822Addresses($recipients),
$identity['ident_email'], $identity['ident_email'],
$_formData['smime_passphrase'] $_formData['smime_passphrase']
); );
@ -3154,7 +3155,7 @@ class mail_compose
$smime_success = $this->_encrypt( $smime_success = $this->_encrypt(
$mail, $mail,
Mail\Smime::TYPE_ENCRYPT, Mail\Smime::TYPE_ENCRYPT,
Mail::stripRFC822Addresses($_formData['to']), Mail::stripRFC822Addresses($recipients),
$identity['ident_email'] $identity['ident_email']
); );
} }