friendica
/
friendica-addons
mirror of https://git.friendi.ca/friendica/friendica-addons.git
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge pull request #953 from nupplaphil/bug/8206-securemail 

[securemail] Fix secure Mail addon
pull/957/head
Hypolite Petovan 2020-01-31 13:44:37 -05:00 committed by GitHub
parent 360e58e6e3 c185bab922
commit f416f4d6a4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
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'); $enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
if (!$enable_checked) { if (!$enable_checked) {
DI::logger()->debug('No securemail enabled.');
return; return;
} }
@ -139,6 +140,7 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
'format' => 'u', 'format' => 'u',
'filename' => 'encrypted.gpg' 'filename' => 'encrypted.gpg'
]); ]);
try { try {
$encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data])); $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
$armored_encrypted = wordwrap( $armored_encrypted = wordwrap(
@ -148,10 +150,8 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
true true
); );
$email = Friendica\Object\EMail::createFromPrototype($email, [ $email = $email->withMessage($armored_encrypted, null);
'textVersion' => $armored_encrypted,
'htmlVersion' => null,
]);
} catch (Exception $e) { } catch (Exception $e) {
DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]); DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]);
} }