X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=securemail%2Fsecuremail.php;h=6e6658682271776471d7a19a2123f719ff3e8886;hb=1357817fc38de7be7dc8ebffc1fa0961796fd32d;hp=50bd27228b0a192821f5d09a3800b1daf51cd966;hpb=c885f3c7ab1895e631b7a1ccb9ec6367e72b5151;p=friendica-addons.git

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 50bd2722..6e665868 100644
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -7,15 +7,13 @@
  */
 
 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\DI;
 use Friendica\Util\Emailer;
 
-require_once 'vendor/autoload.php';
+require_once __DIR__ . '/vendor/autoload.php';
 
 function securemail_install()
 {
@@ -53,17 +51,17 @@ function securemail_settings(App &$a, &$s)
 		return;
 	}
 
-	$enable = intval(PConfig::get(local_user(), 'securemail', 'enable'));
-	$publickey = PConfig::get(local_user(), 'securemail', 'pkey');
+	$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' => 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"']
+		'$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"']
 	]);
 }
 
@@ -84,20 +82,20 @@ function securemail_settings_post(App &$a, array &$b)
 	}
 
 	if ($_POST['securemail-submit']) {
-		PConfig::set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
+		DI::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);
+		DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
+		info(DI::l10n()->t('Secure Mail Settings saved.') . EOL);
 
-		if ($_POST['securemail-submit'] == L10n::t('Save and send test')) {
-			$sitename = Config::get('config', 'sitename');
+		if ($_POST['securemail-submit'] == DI::l10n()->t('Save and send test')) {
+			$sitename = DI::config()->get('config', 'sitename');
 
-			$hostname = $a->getHostName();
+			$hostname = DI::baseUrl()->getHostname();
 			if (strpos($hostname, ':')) {
 				$hostname = substr($hostname, 0, strpos($hostname, ':'));
 			}
 
-			$sender_email = Config::get('config', 'sender_email');
+			$sender_email = DI::config()->get('config', 'sender_email');
 			if (empty($sender_email)) {
 				$sender_email = 'noreply@' . $hostname;
 			}
@@ -116,17 +114,17 @@ function securemail_settings_post(App &$a, array &$b)
 			];
 
 			// enable addon for test
-			PConfig::set(local_user(), 'securemail', 'enable', 1);
+			DI::pConfig()->set(local_user(), 'securemail', 'enable', 1);
 
 			$res = Emailer::send($params);
 
 			// revert to saved value
-			PConfig::set(local_user(), 'securemail', 'enable', $enable);
+			DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
 
 			if ($res) {
-				info(L10n::t('Test email sent') . EOL);
+				info(DI::l10n()->t('Test email sent') . EOL);
 			} else {
-				notice(L10n::t('There was an error sending the test email') . EOL);
+				notice(DI::l10n()->t('There was an error sending the test email') . EOL);
 			}
 		}
 	}
@@ -150,12 +148,12 @@ function securemail_emailer_send_prepare(App &$a, array &$b)
 
 	$uid = $b['uid'];
 
-	$enable_checked = PConfig::get($uid, 'securemail', 'enable');
+	$enable_checked = DI::pConfig()->get($uid, 'securemail', 'enable');
 	if (!$enable_checked) {
 		return;
 	}
 
-	$public_key_ascii = PConfig::get($uid, 'securemail', 'pkey');
+	$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];