friendica/friendica-addons
7
2
Fork 14
Code Issues 3 Pull requests 3 Releases 16 Wiki Activity

[securemail] Fix secure Mail addon #953

Merged
nupplaphil merged 3 commits from bug/8206-securemail into develop 2020-01-31 19:44:38 +01:00
Conversation 0 Commits 3 Files changed 1 +4 -4
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
securemail/securemail.php
View file

@ -124,6 +124,7 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
$enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
if (!$enable_checked) {
DI::logger()->debug('No securemail enabled.');
return;
}
@ -139,6 +140,7 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
'format' => 'u',
'filename' => 'encrypted.gpg'
]);
try {
$encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
$armored_encrypted = wordwrap(
@ -148,10 +150,8 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
true
);
$email = Friendica\Object\EMail::createFromPrototype($email, [
'textVersion' => $armored_encrypted,
'htmlVersion' => null,
]);
$email = $email->withMessage($armored_encrypted, null);
} catch (Exception $e) {
DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]);
}