Rename HTTPRequestOptions to HTTPClientOptions

[friendica-addons.git] / securemail / securemail.php

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 1ec1aa7b809165279299ffd669a46aba1029416d..88e486bb092a30223002cb46f6cef38bfb24e6ef 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -19,23 +19,13 @@ require_once __DIR__ . '/vendor/autoload.php';
 function securemail_install()
 {
        Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');
-       Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post');
+       Hook::register('addon_settings_post', 'addon/securemail/securemail.php', 'securemail_settings_post', 10);
 
-       Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
+       Hook::register('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare', 10);
 
        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
  *
@@ -62,7 +52,7 @@ function securemail_settings(App &$a, &$s)
                '$submit' => DI::l10n()->t('Save Settings'),
                '$test' => DI::l10n()->t('Save and send test'), //NOTE: update also in 'post'
                '$enable' => ['securemail-enable', DI::l10n()->t('Enable Secure Mail'), $enable, ''],
-               '$publickey' => ['securemail-pkey', DI::l10n()->t('Public key'), $publickey, DI::l10n()->t('Your public PGP key, ascii armored format'), 'rows="10"']
+               '$publickey' => ['securemail-pkey', DI::l10n()->t('Public key'), $publickey, DI::l10n()->t('Your public PGP key, ascii armored format')]
        ]);
 }
 
@@ -86,9 +76,8 @@ 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')) {
+               if ($_POST['securemail-submit'] == 'test') {
 
                        $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
 
@@ -124,6 +113,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 +129,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 +139,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]);
        }