X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FModule%2FHome.php;h=fbba889a883af7839d36b7999a3e719d08536820;hb=8b02c285472ea28002cf9c8924e2885dd207ccd8;hp=5a1dccde2a7bd0e47c3e8dc55941454d3ff6949f;hpb=f1e7d97b8cae93e1c77f5a5085880409b01fcdbe;p=friendica.git diff --git a/src/Module/Home.php b/src/Module/Home.php index 5a1dccde2a..fbba889a88 100644 --- a/src/Module/Home.php +++ b/src/Module/Home.php @@ -1,37 +1,66 @@ . + * + */ namespace Friendica\Module; use Friendica\BaseModule; use Friendica\Core\Hook; -use Friendica\Core\L10n; use Friendica\Core\Renderer; +use Friendica\DI; +use Friendica\Model\User; +use Friendica\Module\Security\Login; +use Friendica\Protocol\ActivityPub; /** * Home module - Landing page of the current node */ class Home extends BaseModule { - public static function content() + protected function rawContent(array $request = []) + { + if (ActivityPub::isRequest()) { + DI::baseUrl()->redirect(User::getActorName()); + } + } + + protected function content(array $request = []): string { - $app = self::getApp(); - $config = $app->getConfig(); + $app = DI::app(); + $config = DI::config(); // currently no returned data is used $ret = []; Hook::callAll('home_init', $ret); - if (local_user() && ($app->user['nickname'])) { - $app->internalRedirect('network'); + if (DI::userSession()->getLocalUserId() && ($app->getLoggedInUserNickname())) { + DI::baseUrl()->redirect('network'); } - if (strlen($config->get('system', 'singleuser'))) { - $app->internalRedirect('/profile/' . $config->get('system', 'singleuser')); + if ($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'; @@ -40,11 +69,11 @@ class Home extends BaseModule $customHome = $homeFilePath; if (file_exists($cssFilePath)) { - $app->page['htmlhead'] .= ''; + DI::page()->registerStylesheet('home.css', 'all'); } } - $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);