make errormessages modular and better

[friendica.git] / src / Module / Security / Login.php

diff --git a/src/Module/Security/Login.php b/src/Module/Security/Login.php
index 19e1d8dca36dde778bca9e7017d71f618327aaec..c5028ffc57a7536054b4131c9a2de3095108e681 100644 (file)
--- a/src/Module/Security/Login.php
+++ b/src/Module/Security/Login.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2022, the Friendica project
+ * @copyright Copyright (C) 2010-2023, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -27,7 +27,7 @@ use Friendica\Core\Config\Capability\IManageConfigValues;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session\Capability\IHandleSessions;
+use Friendica\Core\Session\Capability\IHandleUserSessions;
 use Friendica\DI;
 use Friendica\Module\Register;
 use Friendica\Module\Response;
@@ -46,10 +46,10 @@ class Login extends BaseModule
        /** @var IManageConfigValues */
        private $config;
 
-       /** @var IHandleSessions */
+       /** @var IHandleUserSessions */
        private $session;
 
-       public function __construct(Authentication $auth, IManageConfigValues $config, IHandleSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
+       public function __construct(Authentication $auth, IManageConfigValues $config, IHandleUserSessions $session, L10n $l10n, App\BaseURL $baseUrl, App\Arguments $args, LoggerInterface $logger, Profiler $profiler, Response $response, array $server, array $parameters = [])
        {
                parent::__construct($l10n, $baseUrl, $args, $logger, $profiler, $response, $server, $parameters);
 
@@ -62,7 +62,7 @@ class Login extends BaseModule
        {
                $return_path = $request['return_path'] ?? $this->session->pop('return_path', '') ;
 
-               if (DI::userSession()->getLocalUserId()) {
+               if ($this->session->getLocalUserId()) {
                        $this->baseUrl->redirect($return_path);
                }
 
@@ -132,7 +132,6 @@ class Login extends BaseModule
                        DI::page()['htmlhead'] .= Renderer::replaceMacros(
                                Renderer::getMarkupTemplate('login_head.tpl'),
                                [
-                                       '$baseurl' => DI::baseUrl()->get(true)
                                ]
                        );
 
@@ -154,7 +153,7 @@ class Login extends BaseModule
                $o = Renderer::replaceMacros(
                        $tpl,
                        [
-                               '$dest_url'     => DI::baseUrl()->get(true) . '/login',
+                               '$dest_url'     => DI::baseUrl() . '/login',
                                '$logout'       => DI::l10n()->t('Logout'),
                                '$login'        => DI::l10n()->t('Login'),