From: Hypolite Petovan <hypolite@mrpetovan.com>
Date: Sun, 10 Feb 2019 13:45:40 +0000 (-0500)
Subject: [securemail] Use composer autoload
X-Git-Url: https://git.mxchange.org/?a=commitdiff_plain;h=c885f3c7ab1895e631b7a1ccb9ec6367e72b5151;p=friendica-addons.git

[securemail] Use composer autoload
---

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 85632e8c..50bd2722 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -15,16 +15,8 @@ use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
 use Friendica\Util\Emailer;
 
-/* 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 'openpgp.php';
-require_once 'openpgp_crypt_symmetric.php';
+require_once 'vendor/autoload.php';
+
 function securemail_install()
 {
 	Hook::register('addon_settings', 'addon/securemail/securemail.php', 'securemail_settings');