X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=view%2Ftheme%2Fvier%2Ftheme.php;h=65612623d2d9200e7693e0d9f130db9641e45dbe;hb=3546f5b189891e9fc0f0338f8b691b991fa7a549;hp=ec82cf428ddafaa72a41fc79abe9009447d381a3;hpb=7fc37832f77a54a1018afe951788c6e98bfdf3f3;p=friendica.git

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index ec82cf428d..65612623d2 100644
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -31,7 +31,6 @@ use Friendica\Content\ForumManager;
 use Friendica\Core\Addon;
 use Friendica\Core\Renderer;
 use Friendica\Core\Search;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model\Contact;
@@ -43,8 +42,6 @@ use Friendica\Util\Strings;
 
 function vier_init(App $a)
 {
-	$a->setThemeInfoValue('events_in_profile', false);
-
 	Renderer::setActiveTemplateEngine('smarty3');
 
 	$args = DI::args();
@@ -53,7 +50,7 @@ function vier_init(App $a)
 		DI::mode()->has(App\Mode::MAINTENANCEDISABLED)
 		&& (
 			$args->get(0) === 'profile' && $args->get(1) === ($a->getLoggedInUserNickname() ?? '')
-			|| $args->get(0) === 'network' && Session::getLocalUser()
+			|| $args->get(0) === 'network' && DI::userSession()->getLocalUserId()
 		)
 	) {
 		vier_community_info();
@@ -107,7 +104,7 @@ EOT;
 
 	// Hide the left menu bar
 	/// @TODO maybe move this static array out where it should belong?
-	if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "events", "help", "delegation", "notifications",
+	if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "calendar", "help", "delegation", "notifications",
 			"probe", "webfinger", "login", "invite", "credits"])) {
 		DI::page()['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
 	}
@@ -115,8 +112,8 @@ EOT;
 
 function get_vier_config($key, $default = false, $admin = false)
 {
-	if (Session::getLocalUser() && !$admin) {
-		$result = DI::pConfig()->get(Session::getLocalUser(), "vier", $key);
+	if (DI::userSession()->getLocalUserId() && !$admin) {
+		$result = DI::pConfig()->get(DI::userSession()->getLocalUserId(), "vier", $key);
 		if (!is_null($result)) {
 			return $result;
 		}
@@ -145,7 +142,7 @@ function vier_community_info()
 
 	// comunity_profiles
 	if ($show_profiles) {
-		$contacts = Contact\Relation::getSuggestions(Session::getLocalUser(), 0, 9);
+		$contacts = Contact\Relation::getCachedSuggestions(DI::userSession()->getLocalUserId(), 0, 9);
 
 		$tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
 		if (DBA::isResult($contacts)) {
@@ -155,7 +152,7 @@ function vier_community_info()
 			foreach ($contacts as $contact) {
 				$entry = Renderer::replaceMacros($tpl, [
 					'$id' => $contact['id'],
-					'$profile_link' => 'follow/?url='.urlencode($contact['url']),
+					'$profile_link' => 'contact/follow?url=' . urlencode($contact['url']),
 					'$photo' => Contact::getMicro($contact),
 					'$alt_text' => $contact['name'],
 				]);
@@ -192,7 +189,7 @@ function vier_community_info()
 	}
 
 	//right_aside FIND FRIENDS
-	if ($show_friends && Session::getLocalUser()) {
+	if ($show_friends && DI::userSession()->getLocalUserId()) {
 		$nv = [];
 		$nv['findpeople'] = DI::l10n()->t('Find People');
 		$nv['desc'] = DI::l10n()->t('Enter name or interest');
@@ -211,8 +208,8 @@ function vier_community_info()
 	}
 
 	//Community_Pages at right_aside
-	if ($show_pages && Session::getLocalUser()) {
-		$aside['$page'] = ForumManager::widget('network/forum', Session::getLocalUser());;
+	if ($show_pages && DI::userSession()->getLocalUserId()) {
+		$aside['$page'] = ForumManager::widget('network/forum', DI::userSession()->getLocalUserId());;
 	}
 	// END Community Page