X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=mod%2Fhome.php;h=02ec51dc0bb796163b4dc223b1779018712c4e18;hb=234c110d38f50dfcf181797cf02bd721847eb486;hp=206a1827ea1d67eb4a0a575b2c39f2cdebdc8cea;hpb=6b44fbbda03af125035c185c964f10ce78f97610;p=friendica.git diff --git a/mod/home.php b/mod/home.php index 206a1827ea..02ec51dc0b 100644 --- a/mod/home.php +++ b/mod/home.php @@ -6,6 +6,7 @@ use Friendica\App; use Friendica\Core\Addon; use Friendica\Core\Config; use Friendica\Core\L10n; +use Friendica\Core\Renderer; use Friendica\Core\System; use Friendica\Module\Login; @@ -16,11 +17,11 @@ function home_init(App $a) { Addon::callHooks('home_init',$ret); if (local_user() && ($a->user['nickname'])) { - goaway(System::baseUrl()."/network"); + $a->internalRedirect('network'); } if (strlen(Config::get('system','singleuser'))) { - goaway(System::baseUrl()."/profile/" . Config::get('system','singleuser')); + $a->internalRedirect('profile/' . Config::get('system','singleuser')); } }} @@ -28,33 +29,33 @@ function home_init(App $a) { if(! function_exists('home_content')) { function home_content(App $a) { - if (x($_SESSION,'theme')) { + if (!empty($_SESSION['theme'])) { unset($_SESSION['theme']); } - if (x($_SESSION,'mobile-theme')) { + if (!empty($_SESSION['mobile-theme'])) { unset($_SESSION['mobile-theme']); } $customhome = false; - $defaultheader = '

'.((x($a->config,'sitename')) ? L10n::t("Welcome to %s", $a->config['sitename']) : "").'

'; + $defaultheader = '

' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '

'; - $homefilepath = $a->basepath . "/home.html"; - $cssfilepath = $a->basepath . "/home.css"; + $homefilepath = $a->getBasePath() . "/home.html"; + $cssfilepath = $a->getBasePath() . "/home.css"; if (file_exists($homefilepath)) { $customhome = $homefilepath; if (file_exists($cssfilepath)) { $a->page['htmlhead'] .= ''; } - } + } - $login = Login::form($a->query_string, $a->config['register_policy'] == REGISTER_CLOSED ? 0 : 1); + $login = Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1); $content = ''; Addon::callHooks("home_content",$content); - $tpl = get_markup_template('home.tpl'); - return replace_macros($tpl, [ + $tpl = Renderer::getMarkupTemplate('home.tpl'); + return Renderer::replaceMacros($tpl, [ '$defaultheader' => $defaultheader, '$customhome' => $customhome, '$login' => $login,