X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Ffrio%2Ftheme.php;h=5995f54374171f4b2e701e31a8b96f182f22f621;hb=0c4ab89bc3ba01c1e816ac191efcaba31b80c9f3;hp=0487cc7331d3ca707682d225108743527f6fb75b;hpb=c11145d311abb3bceafa1f102f19f95b0164da53;p=friendica.git

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index 0487cc7331..5995f54374 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -14,9 +14,8 @@ use Friendica\Core\Config;
 use Friendica\Core\Hook;
 use Friendica\Core\L10n;
 use Friendica\Core\Logger;
-use Friendica\Core\PConfig;
 use Friendica\Core\Renderer;
-use Friendica\Core\System;
+use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\Model;
 use Friendica\Module;
@@ -42,6 +41,14 @@ function frio_init(App $a)
 			</script>
 EOT;
 	}
+
+	$enable_compose = \Friendica\Core\PConfig::get(local_user(), 'frio', 'enable_compose');
+	$compose = $enable_compose === '1' || $enable_compose === null && Config::get('frio', 'enable_compose') ? 1 : 0;
+	$a->page['htmlhead'] .= <<< HTML
+		<script type="text/javascript">
+			var compose = $compose;
+		</script>
+HTML;
 }
 
 function frio_install()
@@ -201,7 +208,7 @@ function frio_remote_nav($a, &$nav)
 	// get the homelink from $_XSESSION
 	$homelink = Model\Profile::getMyURL();
 	if (!$homelink) {
-		$homelink = defaults($_SESSION, 'visitor_home', '');
+		$homelink = Session::get('visitor_home', '');
 	}
 
 	// split up the url in it's parts (protocol,domain/directory, /profile/, nickname
@@ -237,27 +244,25 @@ function frio_remote_nav($a, &$nav)
 	} elseif (!local_user() && remote_user()) {
 		$r = q("SELECT `name`, `nick`, `micro` AS `photo` FROM `contact` WHERE `id` = %d", intval(remote_user()));
 		$nav['remote'] = L10n::t('Guest');
-		$remoteUser = $r[0];
 	} elseif (Model\Profile::getMyURL()) {
 		$r = q("SELECT `name`, `nick`, `photo` FROM `gcontact`
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
 			DBA::escape($webbie));
 		$nav['remote'] = L10n::t('Visitor');
-		$remoteUser = $r[0];
 	} else {
 		$r = false;
 	}
 
+	$remoteUser = null;
 	if (DBA::isResult($r)) {
 		$nav['userinfo'] = [
 			'icon' => (DBA::isResult($r) ? $r[0]['photo'] : 'images/person-48.jpg'),
 			'name' => $r[0]['name'],
 		];
+		$remoteUser = $r[0];
 	}
 
-	if (!local_user() && !empty($server_url)) {
-		$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
-
+	if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
 		// user menu
 		$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
 		$nav['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];