|
@@ -163,9 +163,9 @@ discard block |
|
|
block discarded – undo |
|
163
|
163
|
$messageClass = mapi_getprops($message, [PR_MESSAGE_CLASS]); |
|
164
|
164
|
$messageClass = $messageClass[PR_MESSAGE_CLASS]; |
|
165
|
165
|
if ($messageClass !== 'IPM.Note.SMIME' && |
|
166
|
|
- $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' && |
|
167
|
|
- $messageClass !== 'IPM.Note.deferSMIME' && |
|
168
|
|
- $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt') |
|
|
166
|
+ $messageClass !== 'IPM.Note.SMIME.SignedEncrypt' && |
|
|
167
|
+ $messageClass !== 'IPM.Note.deferSMIME' && |
|
|
168
|
+ $messageClass !== 'IPM.Note.deferSMIME.SignedEncrypt') |
|
169
|
169
|
return; |
|
170
|
170
|
|
|
171
|
171
|
$recipients = $data['action']['props']['smime']; |
|
@@ -607,17 +607,17 @@ discard block |
|
|
block discarded – undo |
|
607
|
607
|
if (!isset($messageClass)) |
|
608
|
608
|
return; |
|
609
|
609
|
if (stripos($messageClass, 'IPM.Note.deferSMIME') === false && |
|
610
|
|
- stripos($messageClass, 'IPM.Note.SMIME') === false) |
|
|
610
|
+ stripos($messageClass, 'IPM.Note.SMIME') === false) |
|
611
|
611
|
return; |
|
612
|
612
|
|
|
613
|
613
|
// FIXME: for now return when we are going to sign but we don't have the passphrase set |
|
614
|
614
|
// This should never happen sign |
|
615
|
615
|
$encryptionStore = \EncryptionStore::getInstance(); |
|
616
|
616
|
if (($messageClass === 'IPM.Note.deferSMIME.SignedEncrypt' || |
|
617
|
|
- $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' || |
|
618
|
|
- $messageClass === 'IPM.Note.SMIME.SignedEncrypt' || |
|
619
|
|
- $messageClass === 'IPM.Note.SMIME.MultipartSigned') && |
|
620
|
|
- !$encryptionStore->get('smime')) |
|
|
617
|
+ $messageClass === 'IPM.Note.deferSMIME.MultipartSigned' || |
|
|
618
|
+ $messageClass === 'IPM.Note.SMIME.SignedEncrypt' || |
|
|
619
|
+ $messageClass === 'IPM.Note.SMIME.MultipartSigned') && |
|
|
620
|
+ !$encryptionStore->get('smime')) |
|
621
|
621
|
return; |
|
622
|
622
|
// NOTE: setting message class to IPM.Note, so that mapi_inetmapi_imtoinet converts the message to plain email |
|
623
|
623
|
// and doesn't fail when handling the attachments. |