X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=securemail%2Fsecuremail.php;h=fb801a4ce84bc8f03e88aab4d7fe438908631f12;hb=bcb4dd80127b220f90a81843afd8f1a8746f5836;hp=a0ec211a516f06d9c1f349fc64e00e3302d38f0e;hpb=08206fdcc0750ec9dd12a68addb341cd05f8bcfb;p=friendica-addons.git

diff --git a/securemail/securemail.php b/securemail/securemail.php
index a0ec211a..fb801a4c 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -6,208 +6,142 @@
  * Author: Fabio Comuni <http://kirgroup.com/profile/fabrixxm>
  */
 
+use Friendica\Addon\securemail\SecureTestEmail;
 use Friendica\App;
-use Friendica\Core\Config;
 use Friendica\Core\Hook;
-use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Util\Emailer;
+use Friendica\DI;
+use Friendica\Object\EMail\IEmail;
 
-/* because the fraking openpgp-php is in composer, require libs in composer
- * and then don't use autoloader to load classes... */
-$path = __DIR__ . '/vendor/phpseclib/phpseclib/phpseclib/';
-set_include_path(get_include_path() . PATH_SEPARATOR . $path);
-/* so, we don't use the autoloader and include what we need */
-$path = __DIR__ . '/vendor/singpolyma/openpgp-php/lib';
-set_include_path(get_include_path() . PATH_SEPARATOR . $path);
+require_once __DIR__ . '/vendor/autoload.php';
 
-require_once 'openpgp.php';
-require_once 'openpgp_crypt_symmetric.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('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
 
-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('emailer_send_prepare', 'addon/securemail/securemail.php', 'securemail_emailer_send_prepare');
-
-    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');
+	Logger::log('installed securemail');
 }
 
 /**
  * @brief Build user settings form
  *
- * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
+ * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
- * @param App $a App instance
+ * @param App    $a App instance
  * @param string $s output html
  *
- * @see App
+ * @see   App
  */
-function securemail_settings(App &$a, &$s){
-    if (!local_user()) {
-        return;
-    }
-
-    $enable = intval(PConfig::get(local_user(), 'securemail', 'enable'));
-    $publickey = PConfig::get(local_user(), 'securemail', 'pkey');
-
-    $t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/');
-
-    $s .= Renderer::replaceMacros($t, [
-        '$title' => L10n::t('"Secure Mail" Settings'),
-        '$submit' => L10n::t('Save Settings'),
-        '$test' => L10n::t('Save and send test'), //NOTE: update also in 'post'
-        '$enable' => ['securemail-enable', L10n::t('Enable Secure Mail'), $enable, ''],
-        '$publickey' => ['securemail-pkey', L10n::t('Public key'), $publickey, L10n::t('Your public PGP key, ascii armored format'), 'rows="10"']
-    ]);
+function securemail_settings(App &$a, &$s)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	$enable = intval(DI::pConfig()->get(local_user(), 'securemail', 'enable'));
+	$publickey = DI::pConfig()->get(local_user(), 'securemail', 'pkey');
+
+	$t = Renderer::getMarkupTemplate('admin.tpl', 'addon/securemail/');
+
+	$s .= Renderer::replaceMacros($t, [
+		'$title' => DI::l10n()->t('"Secure Mail" Settings'),
+		'$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"']
+	]);
 }
 
 /**
  * @brief Handle data from user settings form
  *
- * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
+ * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
- * @param App $a App instance
+ * @param App   $a App instance
  * @param array $b hook data
  *
- * @see App
+ * @see   App
  */
-function securemail_settings_post(App &$a, array &$b){
-
-    if (!local_user()) {
-        return;
-    }
-
-    if ($_POST['securemail-submit']) {
-        PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
-        $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
-        PConfig::set(local_user(), 'securemail', 'enable', $enable);
-        info(L10n::t('Secure Mail Settings saved.') . EOL);
-
-        if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
-            $sitename = Config::get('config', 'sitename');
-
-            $hostname = $a->getHostName();
-            if (strpos($hostname, ':')) {
-                $hostname = substr($hostname, 0, strpos($hostname, ':'));
-            }
-
-            $sender_email = 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
-            PConfig::set(local_user(), 'securemail', 'enable', 1);
-
-            $res = Emailer::send($params);
-
-            // revert to saved value
-            PConfig::set(local_user(), 'securemail', 'enable', $enable);
-
-            if ($res) {
-                info(L10n::t('Test email sent') . EOL);
-            } else {
-                notice(L10n::t('There was an error sending the test email') . EOL);
-            }
-        }
-    }
+function securemail_settings_post(App &$a, array &$b)
+{
+	if (!local_user()) {
+		return;
+	}
+
+	if ($_POST['securemail-submit']) {
+		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);
+
+		if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) {
+
+			$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);
+
+			if ($res) {
+				info(DI::l10n()->t('Test email sent') . EOL);
+			} else {
+				notice(DI::l10n()->t('There was an error sending the test email') . EOL);
+			}
+		}
+	}
 }
 
 /**
  * @brief Encrypt notification emails text
  *
- * @link https://github.com/friendica/friendica/blob/develop/doc/Addons.md#emailer_send_prepare 'emailer_send_prepare' hook
+ * @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 App   $a App instance
+ * @param IEmail $email Email
  *
- * @see App
+ * @see   App
  */
-function securemail_emailer_send_prepare(App &$a, array &$b) {
-    if (empty($b['uid'])) {
-        return;
-    }
-
-    $uid = $b['uid'];
-
-    $enable_checked = PConfig::get($uid, 'securemail', 'enable');
-    if (!$enable_checked) {
-        return;
-    }
-
-    $public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
-
-    preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
-    $marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
-    $public_key = OpenPGP::unarmor($public_key_ascii, $marker);
-
-    $key = OpenPGP_Message::parse($public_key);
-
-    $data = new OpenPGP_LiteralDataPacket($b['textVersion'], [
-        '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;
+function securemail_emailer_send_prepare(App &$a, IEmail &$email)
+{
+	if (empty($email->getRecipientUid())) {
+		return;
+	}
+
+	$uid = $email->getRecipientUid();
+
+	$enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
+	if (!$enable_checked) {
+		DI::logger()->debug('No securemail enabled.');
+		return;
+	}
+
+	$public_key_ascii = DI::pConfig()->get($uid, 'securemail', 'pkey');
+
+	preg_match('/-----BEGIN ([A-Za-z ]+)-----/', $public_key_ascii, $matches);
+	$marker = empty($matches[1]) ? 'MESSAGE' : $matches[1];
+	$public_key = OpenPGP::unarmor($public_key_ascii, $marker);
+
+	$key = OpenPGP_Message::parse($public_key);
+
+	$data = new OpenPGP_LiteralDataPacket($email->getMessage(true), [
+		'format' => 'u',
+		'filename' => 'encrypted.gpg'
+	]);
+
+	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]);
+	}
 }
-
-
-/**
- * add addon composer autoloader maps to system autoloader
-
-function securemail_autoloader() {
-
-    $loader = require dirname(dirname(__DIR__)) . '/vendor/autoload.php';
-
-    $map = require __DIR__ . '/vendor/composer/autoload_namespaces.php';
-    foreach ($map as $namespace => $path) {
-        $loader->set($namespace, $path);
-    }
-
-    $map = require __DIR__ . '/vendor/composer/autoload_psr4.php';
-    foreach ($map as $namespace => $path) {
-        $loader->setPsr4($namespace, $path);
-    }
-
-    $classMap = require __DIR__ . '/vendor/composer/autoload_classmap.php';
-    if ($classMap) {
-        $loader->addClassMap($classMap);
-    }
-}
-securemail_autoloader();
-
-*/