gravatar addon HU translation updated THX Balázs Úr

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

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 6e6658682271776471d7a19a2123f719ff3e8886..fb801a4ce84bc8f03e88aab4d7fe438908631f12 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -6,12 +6,13 @@
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
 
+use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\App;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
 use Friendica\DI;
-use Friendica\Util\Emailer;
+use Friendica\Object\EMail\IEmail;
 
 require_once __DIR__ . '/vendor/autoload.php';
 
@@ -25,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
  *
@@ -85,38 +76,10 @@ 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')) {
-                       $sitename = DI::config()->get('config', 'sitename');
-
-                       $hostname = DI::baseUrl()->getHostname();
-                       if (strpos($hostname, ':')) {
-                               $hostname = substr($hostname, 0, strpos($hostname, ':'));
-                       }
-
-                       $sender_email = DI::config()->get('config', 'sender_email');
-                       if (empty($sender_email)) {
-                               $sender_email = 'noreply@' . $hostname;
-                       }
 
-                       $subject = 'Friendica - Secure Mail - Test';
-                       $message = 'This is a test message from your Friendica Secure Mail addon.';
-
-                       $params = [
-                               'uid' => local_user(),
-                               'fromName' => $sitename,
-                               'fromEmail' => $sender_email,
-                               'toEmail' => $a->user['email'],
-                               'messageSubject' => $subject,
-                               'htmlVersion' => "<p>{$message}</p>",
-                               'textVersion' => $message,
-                       ];
-
-                       // enable addon for test
-                       DI::pConfig()->set(local_user(), 'securemail', 'enable', 1);
-
-                       $res = Emailer::send($params);
+                       $res = DI::emailer()->send(new SecureTestEmail(DI::app(), DI::config(), DI::pConfig(), DI::baseUrl()));
 
                        // revert to saved value
                        DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
@@ -136,20 +99,21 @@ function securemail_settings_post(App &$a, array &$b)
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
  *
  * @param App   $a App instance
- * @param array $b hook data
+ * @param IEmail $email Email
  *
  * @see   App
  */
-function securemail_emailer_send_prepare(App &$a, array &$b)
+function securemail_emailer_send_prepare(App &$a, IEmail &$email)
 {
-       if (empty($b['uid'])) {
+       if (empty($email->getRecipientUid())) {
                return;
        }
 
-       $uid = $b['uid'];
+       $uid = $email->getRecipientUid();
 
        $enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
        if (!$enable_checked) {
+               DI::logger()->debug('No securemail enabled.');
                return;
        }
 
@@ -161,18 +125,23 @@ function securemail_emailer_send_prepare(App &$a, array &$b)
 
        $key = OpenPGP_Message::parse($public_key);
 
-       $data = new OpenPGP_LiteralDataPacket($b['textVersion'], [
+       $data = new OpenPGP_LiteralDataPacket($email->getMessage(true), [
                'format' => 'u',
                'filename' => 'encrypted.gpg'
        ]);
-       $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
-       $armored_encrypted = wordwrap(
-               OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE'),
-               64,
-               "\n",
-               true
-       );
-
-       $b['textVersion'] = $armored_encrypted;
-       $b['htmlVersion'] = null;
+
+       try {
+               $encrypted = OpenPGP_Crypt_Symmetric::encrypt($key, new OpenPGP_Message([$data]));
+               $armored_encrypted = wordwrap(
+                       OpenPGP::enarmor($encrypted->to_bytes(), 'PGP MESSAGE'),
+                       64,
+                       "\n",
+                       true
+               );
+
+               $email = $email->withMessage($armored_encrypted, null);
+
+       } catch (Exception $e) {
+               DI::logger()->warning('Encryption failed.', ['email' => $email, 'exception' => $e]);
+       }
 }