This addon will replace "youtube.com" with the chosen Invidious instance

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

diff --git a/securemail/securemail.php b/securemail/securemail.php
index 82c5aec7cf3938404329874ffeb736d03eed65b7..5390ebd14523082876c08e5fdf38fb0f4abc866f 100644 (file)
--- a/securemail/securemail.php
+++ b/securemail/securemail.php
@@ -31,19 +31,18 @@ function securemail_install()
  *
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings 'addon_settings' hook
  *
- * @param App    $a App instance
- * @param string $s output html
+ * @param array $data
  *
  * @see   App
  */
-function securemail_settings(App &$a, array &$data)
+function securemail_settings(array &$data)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
-       $enabled   = intval(DI::pConfig()->get(local_user(), 'securemail', 'enable'));
-       $publickey = DI::pConfig()->get(local_user(), 'securemail', 'pkey');
+       $enabled   = intval(DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'enable'));
+       $publickey = DI::pConfig()->get(DI::userSession()->getLocalUserId(), 'securemail', 'pkey');
 
        $t    = Renderer::getMarkupTemplate('settings.tpl', 'addon/securemail/');
        $html = Renderer::replaceMacros($t, [
@@ -67,27 +66,26 @@ function securemail_settings(App &$a, array &$data)
  *
  * @link  https://github.com/friendica/friendica/blob/develop/doc/Addons.md#addon_settings_post 'addon_settings_post' hook
  *
- * @param App   $a App instance
  * @param array $b hook data
  *
  * @see   App
  */
-function securemail_settings_post(App &$a, array &$b)
+function securemail_settings_post(array &$b)
 {
-       if (!local_user()) {
+       if (!DI::userSession()->getLocalUserId()) {
                return;
        }
 
        if (!empty($_POST['securemail-submit']) || !empty($_POST['securemail-test'])) {
-               DI::pConfig()->set(local_user(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'pkey', trim($_POST['securemail-pkey']));
                $enable = (!empty($_POST['securemail-enable']) ? 1 : 0);
-               DI::pConfig()->set(local_user(), 'securemail', 'enable', $enable);
+               DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
 
                if (!empty($_POST['securemail-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);
+                       DI::pConfig()->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', $enable);
 
                        if ($res) {
                                DI::sysmsg()->addInfo(DI::l10n()->t('Test email sent'));
@@ -103,12 +101,11 @@ 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 IEmail $email Email
  *
  * @see   App
  */
-function securemail_emailer_send_prepare(App &$a, IEmail &$email)
+function securemail_emailer_send_prepare(IEmail &$email)
 {
        if (empty($email->getRecipientUid())) {
                return;