X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHome.php;h=87de58a15d5d34c4be1777ad13077d2e6af271c9;hb=b36d4eb0dd4bdc25a468c95c749bfae1b6324be9;hp=f5032f7c30ddaecd93b5a048bccef357eb23b733;hpb=fceb4f3823c13675ffd2db8bea64af6aa7fc5406;p=friendica.git diff --git a/src/Module/Home.php b/src/Module/Home.php index f5032f7c30..87de58a15d 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -1,11 +1,30 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\Core\Session; use Friendica\DI; use Friendica\Module\Security\Login; @@ -14,7 +33,7 @@ use Friendica\Module\Security\Login; */ class Home extends BaseModule { - public static function content(array $parameters = []) + protected function content(array $request = []): string { $app = DI::app(); $config = DI::config(); @@ -24,16 +43,16 @@ class Home extends BaseModule Hook::callAll('home_init', $ret); - if (local_user() && ($app->user['nickname'])) { - $app->internalRedirect('network'); + if (Session::getLocalUser() && ($app->getLoggedInUserNickname())) { + DI::baseUrl()->redirect('network'); } if (strlen($config->get('system', 'singleuser'))) { - $app->internalRedirect('/profile/' . $config->get('system', 'singleuser')); + DI::baseUrl()->redirect('/profile/' . $config->get('system', 'singleuser')); } $customHome = ''; - $defaultHeader = ($config->get('config', 'sitename') ? L10n::t('Welcome to %s', $config->get('config', 'sitename')) : ''); + $defaultHeader = ($config->get('config', 'sitename') ? DI::l10n()->t('Welcome to %s', $config->get('config', 'sitename')) : ''); $homeFilePath = $app->getBasePath() . '/home.html'; $cssFilePath = $app->getBasePath() . '/home.css'; @@ -42,11 +61,11 @@ class Home extends BaseModule $customHome = $homeFilePath; if (file_exists($cssFilePath)) { - $app->page['htmlhead'] .= ''; + DI::page()['htmlhead'] .= ''; } } - $login = Login::form($app->query_string, $config->get('config', 'register_policy') === Register::CLOSED ? 0 : 1); + $login = Login::form(DI::args()->getQueryString(), $config->get('config', 'register_policy') === Register::CLOSED ? 0 : 1); $content = ''; Hook::callAll('home_content', $content);