X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;ds=sidebyside;f=mod%2Fhome.php;h=02ec51dc0bb796163b4dc223b1779018712c4e18;hb=f6917dd8f494769c8f0f0c53d2105175d9cf6ad6;hp=b1708d80a2f02e36fe78b650841581508323a316;hpb=4ebebe96fee1ea3dda219fa7049e6d14a142aa19;p=friendica.git

diff --git a/mod/home.php b/mod/home.php
index b1708d80a2..02ec51dc0b 100644
--- a/mod/home.php
+++ b/mod/home.php
@@ -1,17 +1,27 @@
 <?php
+/**
+ * @file mod/home.php
+ */
+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;
 
 if(! function_exists('home_init')) {
 function home_init(App $a) {
 
-	$ret = array();
-	call_hooks('home_init',$ret);
+	$ret = [];
+	Addon::callHooks('home_init',$ret);
 
 	if (local_user() && ($a->user['nickname'])) {
-		goaway(App::get_baseurl()."/network");
+		$a->internalRedirect('network');
 	}
 
-	if (strlen(get_config('system','singleuser'))) {
-		goaway(App::get_baseurl()."/profile/" . get_config('system','singleuser'));
+	if (strlen(Config::get('system','singleuser'))) {
+		$a->internalRedirect('profile/' . Config::get('system','singleuser'));
 	}
 
 }}
@@ -19,30 +29,38 @@ function home_init(App $a) {
 if(! function_exists('home_content')) {
 function home_content(App $a) {
 
-	$o = '';
-
-	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']);
 	}
 
-	/// @TODO No absolute path used, maybe risky (security)
-	if (file_exists('home.html')) {
-		if (file_exists('home.css')) {
-			$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.App::get_baseurl().'/home.css'.'" media="all" />';
-		}
+	$customhome = false;
+	$defaultheader = '<h1>' . (Config::get('config', 'sitename') ? L10n::t('Welcome to %s', Config::get('config', 'sitename')) : '') . '</h1>';
 
-		$o .= file_get_contents('home.html');
-	} else {
-		$o .= '<h1>'.((x($a->config,'sitename')) ? sprintf(t("Welcome to %s"), $a->config['sitename']) : "").'</h1>';
+	$homefilepath = $a->getBasePath() . "/home.html";
+	$cssfilepath = $a->getBasePath() . "/home.css";
+	if (file_exists($homefilepath)) {
+		$customhome = $homefilepath;
+		if (file_exists($cssfilepath)) {
+			$a->page['htmlhead'] .= '<link rel="stylesheet" type="text/css" href="'.System::baseUrl().'/home.css'.'" media="all" />';
+		}
 	}
 
+	$login = Login::form($a->query_string, intval(Config::get('config', 'register_policy')) === REGISTER_CLOSED ? 0 : 1);
+
+	$content = '';
+	Addon::callHooks("home_content",$content);
 
-	$o .= login(($a->config['register_policy'] == REGISTER_CLOSED) ? 0 : 1);
 
-	call_hooks("home_content",$o);
+	$tpl = Renderer::getMarkupTemplate('home.tpl');
+	return Renderer::replaceMacros($tpl, [
+		'$defaultheader' => $defaultheader,
+		'$customhome' => $customhome,
+		'$login' => $login,
+		'$content' => $content
+	]);
 
 	return $o;