[various] Remove App dependency from hook functions

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

diff --git a/securemail/SecureTestEmail.php b/securemail/SecureTestEmail.php
index b3abcd509f06f7a198e0ab1fd7592685c60fe941..2832adbabbac61b28c404126ac63d7cdf0b25347 100644 (file)
--- a/securemail/SecureTestEmail.php
+++ b/securemail/SecureTestEmail.php
@@ -23,8 +23,9 @@ namespace Friendica\Addon\securemail;
 
 use Friendica\App;
 use Friendica\App\BaseURL;
-use Friendica\Core\Config\IConfig;
-use Friendica\Core\PConfig\IPConfig;
+use Friendica\Core\Config\Capability\IManageConfigValues;
+use Friendica\Core\PConfig\Capability\IManagePersonalConfigValues;
+use Friendica\DI;
 use Friendica\Model\User;
 use Friendica\Object\Email;
 
@@ -33,7 +34,7 @@ use Friendica\Object\Email;
  */
 class SecureTestEmail extends Email
 {
-       public function __construct(App $a, IConfig $config, IPConfig $pConfig, BaseURL $baseUrl)
+       public function __construct(IManageConfigValues $config, IManagePersonalConfigValues $pConfig, BaseURL $baseUrl)
        {
                $sitename = $config->get('config', 'sitename');
 
@@ -47,16 +48,16 @@ class SecureTestEmail extends Email
                        $sender_email = 'noreply@' . $hostname;
                }
 
-               $user = User::getById(local_user());
+               $user = User::getById(DI::userSession()->getLocalUserId());
 
                $subject = 'Friendica - Secure Mail - Test';
                $message = 'This is a test message from your Friendica Secure Mail addon.';
 
                // enable addon for test
-               $pConfig->set(local_user(), 'securemail', 'enable', 1);
+               $pConfig->set(DI::userSession()->getLocalUserId(), 'securemail', 'enable', 1);
 
                parent::__construct($sitename, $sender_email, $sender_email, $user['email'],
                        $subject, "<p>{$message}</p>", $message,
-                       [], local_user());
+                       [], DI::userSession()->getLocalUserId());
        }
 }