X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=securemail%2Fsecuremail.php;h=fb801a4ce84bc8f03e88aab4d7fe438908631f12;hb=2dbcc42384b85e5253b939f528236f41909b1596;hp=b45a91bcc0b82259ca38507b0bffcdec5f0d7085;hpb=7603b237998d7225839b4eeb565a5f25bdd5d5fb;p=friendica-addons.git diff --git a/securemail/securemail.php b/securemail/securemail.php index b45a91bc..fb801a4c 100644 --- a/securemail/securemail.php +++ b/securemail/securemail.php @@ -26,16 +26,6 @@ function securemail_install() Logger::log('installed securemail'); } -function securemail_uninstall() -{ - Hook::unregister('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings'); - Hook::unregister('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post'); - - Hook::unregister('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare'); - - Logger::log('removed securemail'); -} - /** * @brief Build user settings form * @@ -86,7 +76,6 @@ function securemail_settings_post(App &$a, array &$b) DI::pConfig()->set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey'])); $enable = (!empty($_POST['securemail-enable']) ? 1 : 0); DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable); - info(DI::l10n()->t('Secure Mail Settings saved.') . EOL); if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) { @@ -116,8 +105,6 @@ function securemail_settings_post(App &$a, array &$b) */ function securemail_emailer_send_prepare(App &$a, IEmail &$email) { - DI::logger()->warning('start securemail', ['email' => $email]); - if (empty($email->getRecipientUid())) { return; } @@ -126,7 +113,7 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email) $enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable'); if (!$enable_checked) { - DI::logger()->warning('No check!!', ['email' => $email]); + DI::logger()->debug('No securemail enabled.'); return; } @@ -136,8 +123,6 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email) $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1]; $public_key = OpenPGP::unarmor($public_key_ascii, $marker); - DI::logger()->warning('public key', ['public_key' => $public_key]); - $key = OpenPGP_Message::parse($public_key); $data = new OpenPGP_LiteralDataPacket($email->getMessage(true), [ @@ -145,8 +130,6 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email) 'filename' => 'encrypted.gpg' ]); - DI::logger()->warning('data', ['data' => $data]); - try { $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data])); $armored_encrypted = wordwrap( @@ -158,8 +141,6 @@ function securemail_emailer_send_prepare(App &$a, IEmail &$email) $email = $email->withMessage($armored_encrypted, null); - DI::logger()->warning('End securemail', ['email' => $email]); - } catch (Exception $e) { DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]); }