Link to displayed contact URL no matter the "Stay local" setting value

[friendica.git] / view / theme / vier / theme.php

diff --git a/view/theme/vier/theme.php b/view/theme/vier/theme.php
index a688d68452887dbfbdd006dbaf548d0a6e7747bd..c1562983812416cab64d99939fbf78051582ee94 100644 (file)
--- a/view/theme/vier/theme.php
+++ b/view/theme/vier/theme.php
@@ -21,11 +21,14 @@ use Friendica\Util\Strings;
 
 function vier_init(App $a)
 {
-       $a->theme_events_in_profile = false;
+       $a->setThemeInfoValue('events_in_profile', false);
 
        Renderer::setActiveTemplateEngine('smarty3');
 
-       if (!empty($a->argv[0]) && ($a->argv[0] . ($a->argv[1] ?? '')) === ('profile' . ($a->user['nickname'] ?? '')) || $a->argv[0] === 'network' && local_user()) {
+       $args = DI::args();
+
+       if ($args->get(0) === 'profile' && $args->get(1) === ($a->getLoggedInUserNickname() ?? '') || $args->get(0) === 'network' && local_user()
+       ) {
                vier_community_info();
 
                DI::page()['htmlhead'] .= "<link rel='stylesheet' type='text/css' href='view/theme/vier/wide.css' media='screen and (min-width: 1300px)'/>\n";
@@ -77,7 +80,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($a->argv[0], ["community", "events", "help", "delegation", "notifications",
+       if (empty(DI::page()['aside']) && in_array($args->get(0), ["community", "events", "help", "delegation", "notifications",
                        "probe", "webfinger", "login", "invite", "credits"])) {
                DI::page()['htmlhead'] .= "<link rel='stylesheet' href='view/theme/vier/hide.css' />";
        }
@@ -102,8 +105,6 @@ function get_vier_config($key, $default = false, $admin = false)
 
 function vier_community_info()
 {
-       $a = DI::app();
-
        $show_pages      = get_vier_config("show_pages", 1);
        $show_profiles   = get_vier_config("show_profiles", 1);
        $show_helpers    = get_vier_config("show_helpers", 1);
@@ -117,7 +118,7 @@ function vier_community_info()
 
        // comunity_profiles
        if ($show_profiles) {
-               $contacts = Contact::getSuggestions(local_user(), 0, 9);
+               $contacts = Contact\Relation::getSuggestions(local_user(), 0, 9);
 
                $tpl = Renderer::getMarkupTemplate('ch_directory_item.tpl');
                if (DBA::isResult($contacts)) {
@@ -184,49 +185,7 @@ function vier_community_info()
 
        //Community_Pages at right_aside
        if ($show_pages && local_user()) {
-               $cid = $_GET['cid'] ?? null;
-
-               //sort by last updated item
-               $lastitem = true;
-
-               $contacts = ForumManager::getList($a->user['uid'], $lastitem, true, true);
-               $total = count($contacts);
-               $visible_forums = 10;
-
-               if (count($contacts)) {
-                       $id = 0;
-
-                       foreach ($contacts as $contact) {
-                               $selected = (($cid == $contact['id']) ? ' forum-selected' : '');
-
-                               $entry = [
-                                       'url'          => 'network?contactid=' . $contact['id'],
-                                       'external_url' => Contact::magicLink($contact['url']),
-                                       'name'         => $contact['name'],
-                                       'cid'          => $contact['id'],
-                                       'selected'     => $selected,
-                                       'micro'        => Contact::getMicro($contact),
-                                       'id'           => ++$id,
-                               ];
-                               $entries[] = $entry;
-                       }
-
-
-                       $tpl = Renderer::getMarkupTemplate('widget_forumlist_right.tpl');
-
-                       $page = Renderer::replaceMacros(
-                               $tpl,
-                               [
-                                       '$title'          => DI::l10n()->t('Forums'),
-                                       '$forums'         => $entries,
-                                       '$link_desc'      => DI::l10n()->t('External link to forum'),
-                                       '$total'          => $total,
-                                       '$visible_forums' => $visible_forums,
-                                       '$showmore'       => DI::l10n()->t('show more')]
-                       );
-
-                       $aside['$page'] = $page;
-               }
+               $aside['$page'] = ForumManager::widget('network/forum', local_user());;
        }
        // END Community Page
 
@@ -326,7 +285,7 @@ function vier_community_info()
                        $r[] = ["photo" => "images/wordpress.png", "name" => "Wordpress"];
                }
 
-               if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled") && !DI::config()->get("system", "dfrn_only")) {
+               if (function_exists("imap_open") && !DI::config()->get("system", "imap_disabled")) {
                        $r[] = ["photo" => "images/mail.png", "name" => "E-Mail"];
                }