]> git.mxchange.org Git - friendica.git/blobdiff - view/theme/frio/theme.php
Add title to homepage verified check mark
[friendica.git] / view / theme / frio / theme.php
index 2913a1553317d98798ebb6ff41c1237b93de0261..f4daed4d6c1cb2f698f2a6afdb322be078a9b298 100644 (file)
@@ -29,7 +29,6 @@ use Friendica\Content\Widget;
 use Friendica\Core\Hook;
 use Friendica\Core\Logger;
 use Friendica\Core\Renderer;
-use Friendica\Core\Session;
 use Friendica\Database\DBA;
 use Friendica\DI;
 use Friendica\Model;
@@ -215,8 +214,8 @@ function frio_remote_nav(App $a, array &$nav_info)
                $fields = ['id', 'url', 'avatar', 'micro', 'name', 'nick', 'baseurl', 'updated'];
                if ($a->isLoggedIn()) {
                        $remoteUser = Contact::selectFirst($fields, ['uid' => $a->getLoggedInUserId(), 'self' => true]);
-               } elseif (!local_user() && remote_user()) {
-                       $remoteUser                = Contact::getById(remote_user(), $fields);
+               } elseif (!DI::userSession()->getLocalUserId() && DI::userSession()->getRemoteUserId()) {
+                       $remoteUser                = Contact::getById(DI::userSession()->getRemoteUserId(), $fields);
                        $nav_info['nav']['remote'] = DI::l10n()->t('Guest');
                } elseif (Profile::getMyURL()) {
                        $remoteUser                = Contact::getByURL($homelink, null, $fields);
@@ -233,17 +232,17 @@ function frio_remote_nav(App $a, array &$nav_info)
                        $server_url           = $remoteUser['baseurl'];
                }
 
-               if (!local_user() && !empty($server_url) && !is_null($remoteUser)) {
+               if (!DI::userSession()->getLocalUserId() && !empty($server_url) && !is_null($remoteUser)) {
                        // user menu
                        $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'], DI::l10n()->t('Status'), '', DI::l10n()->t('Your posts and conversations')];
                        $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/profile', DI::l10n()->t('Profile'), '', DI::l10n()->t('Your profile page')];
                        $nav_info['nav']['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], DI::l10n()->t('Photos'), '', DI::l10n()->t('Your photos')];
                        $nav_info['nav']['usermenu'][] = [$server_url . '/profile/' . $remoteUser['nick'] . '/media', DI::l10n()->t('Media'), '', DI::l10n()->t('Your postings with media')];
-                       $nav_info['nav']['usermenu'][] = [$server_url . '/events/', DI::l10n()->t('Events'), '', DI::l10n()->t('Your events')];
+                       $nav_info['nav']['usermenu'][] = [$server_url . '/calendar/', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Your calendar')];
 
                        // navbar links
                        $nav_info['nav']['network']  = [$server_url . '/network', DI::l10n()->t('Network'), '', DI::l10n()->t('Conversations from your friends')];
-                       $nav_info['nav']['events']   = [$server_url . '/events', DI::l10n()->t('Events'), '', DI::l10n()->t('Events and Calendar')];
+                       $nav_info['nav']['calendar'] = [$server_url . '/calendar', DI::l10n()->t('Calendar'), '', DI::l10n()->t('Calendar')];
                        $nav_info['nav']['messages'] = [$server_url . '/message', DI::l10n()->t('Messages'), '', DI::l10n()->t('Private mail')];
                        $nav_info['nav']['settings'] = [$server_url . '/settings', DI::l10n()->t('Settings'), '', DI::l10n()->t('Account settings')];
                        $nav_info['nav']['contacts'] = [$server_url . '/contact', DI::l10n()->t('Contacts'), '', DI::l10n()->t('Manage/edit friends and contacts')];
@@ -257,8 +256,8 @@ function frio_display_item(App $a, &$arr)
        // Add follow to the item menu
        $followThread = [];
        if (
-               local_user()
-               && in_array($arr['item']['uid'], [0, local_user()])
+               DI::userSession()->getLocalUserId()
+               && in_array($arr['item']['uid'], [0, DI::userSession()->getLocalUserId()])
                && $arr['item']['gravity'] == Item::GRAVITY_PARENT
                && !$arr['item']['self']
                && !$arr['item']['mention']