From c885f3c7ab1895e631b7a1ccb9ec6367e72b5151 Mon Sep 17 00:00:00 2001 From: Hypolite Petovan Date: Sun, 10 Feb 2019 08:45:40 -0500 Subject: [PATCH] [securemail] Use composer autoload --- securemail/securemail.php | 10 +--------- 1 file changed, 1 insertion(+), 9 deletions(-) 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 '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');