From cd3f380fcd1bf5b68ea136fff81439629bf99461 Mon Sep 17 00:00:00 2001 From: Hadi Nategh Date: Mon, 17 Sep 2018 11:08:52 +0200 Subject: [PATCH] * Mail: fix signed/encrypted S/MIME new message does not take CC or BCC fields into account --- mail/inc/class.mail_compose.inc.php | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/mail/inc/class.mail_compose.inc.php b/mail/inc/class.mail_compose.inc.php index 6e56b88bd0..15eaeb5e3f 100644 --- a/mail/inc/class.mail_compose.inc.php +++ b/mail/inc/class.mail_compose.inc.php @@ -3108,6 +3108,7 @@ class mail_compose // SMIME SIGN/ENCRYPTION if ($_formData['smime_sign'] == 'on' || $_formData['smime_encrypt'] == 'on' ) { + $recipients = array_merge($_formData['to'], (array) $_formData['cc'], (array) $_formData['bcc']); try { if ($_formData['smime_sign'] == 'on') { @@ -3122,7 +3123,7 @@ class mail_compose $smime_success = $this->_encrypt( $mail, $_formData['smime_encrypt'] == 'on'? Mail\Smime::TYPE_SIGN_ENCRYPT: Mail\Smime::TYPE_SIGN, - Mail::stripRFC822Addresses($_formData['to']), + Mail::stripRFC822Addresses($recipients), $identity['ident_email'], $_formData['smime_passphrase'] ); @@ -3141,7 +3142,7 @@ class mail_compose $smime_success = $this->_encrypt( $mail, Mail\Smime::TYPE_ENCRYPT, - Mail::stripRFC822Addresses($_formData['to']), + Mail::stripRFC822Addresses($recipients), $identity['ident_email'] ); }