[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
Showing only changes of commit c185bab922 - Show all commits

View file

@ -116,8 +116,6 @@ function securemail_settings_post(App &$a, array &$b)
*/
function securemail_emailer_send_prepare(App &$a, IEmail &$email)
{
DI::logger()->debug('start securemail', ['email' => $email]);
if (empty($email->getRecipientUid())) {
return;
}
@ -126,7 +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 check', ['email' => $email]);
DI::logger()->debug('No securemail enabled.');
return;
}
@ -154,8 +152,6 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email)
$email = $email->withMessage($armored_encrypted, null);
DI::logger()->debug('End securemail', ['email' => $email]);
} catch (Exception $e) {
DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]);
}