From 16beab4652fa40027da7952b86d9cf3033b55112 Mon Sep 17 00:00:00 2001 From: Michael Date: Sat, 21 Apr 2018 21:59:02 +0000 Subject: [PATCH] Better working with private forums --- mod/noscrape.php | 25 +++++----- src/Content/Nav.php | 110 ++++++++++++++++++++---------------------- src/Model/Contact.php | 2 +- src/Protocol/DFRN.php | 17 ++++--- 4 files changed, 77 insertions(+), 77 deletions(-) diff --git a/mod/noscrape.php b/mod/noscrape.php index 9efaeb2bf1..20936929dd 100644 --- a/mod/noscrape.php +++ b/mod/noscrape.php @@ -23,9 +23,18 @@ function noscrape_init(App $a) Profile::load($a, $which, $profile); + $json_info = [ + 'addr' => $a->profile['addr'], + 'nick' => $which, + 'guid' => $a->profile['guid'], + 'key' => $a->profile['pubkey'], + 'homepage' => System::baseUrl()."/profile/{$which}", + 'comm' => ($a->profile['account-type'] == ACCOUNT_TYPE_COMMUNITY), + ]; + if (!$a->profile['net-publish'] || $a->profile['hidewall']) { header('Content-type: application/json; charset=utf-8'); - $json_info = ["hide" => true]; + $json_info["hide"] = true; echo json_encode($json_info); exit; } @@ -36,17 +45,9 @@ function noscrape_init(App $a) $contactPhoto = dba::selectFirst('contact', ['photo'], ['self' => true, 'uid' => $a->profile['uid']]); - $json_info = [ - 'fn' => $a->profile['name'], - 'addr' => $a->profile['addr'], - 'nick' => $which, - 'guid' => $a->profile['guid'], - 'key' => $a->profile['pubkey'], - 'homepage' => System::baseUrl()."/profile/{$which}", - 'comm' => (x($a->profile, 'page-flags')) && ($a->profile['page-flags'] == PAGE_COMMUNITY), - 'photo' => $contactPhoto["photo"], - 'tags' => $keywords - ]; + $json_info['fn'] = $a->profile['name']; + $json_info['photo'] = $contactPhoto["photo"]; + $json_info['tags'] = $keywords; if (is_array($a->profile) && !$a->profile['hide-friends']) { /// @todo What should this value tell us? diff --git a/src/Content/Nav.php b/src/Content/Nav.php index c7dfd447cd..c437c6e2a1 100644 --- a/src/Content/Nav.php +++ b/src/Content/Nav.php @@ -28,23 +28,23 @@ class Nav if (!(x($a->page, 'nav'))) { $a->page['nav'] = ''; } - + $a->page['htmlhead'] .= replace_macros(get_markup_template('nav_head.tpl'), []); - + /* * Placeholder div for popup panel */ - + $a->page['nav'] .= '' ; - + $nav_info = self::getInfo($a); - + /* * Build the page */ - + $tpl = get_markup_template('nav.tpl'); - + $a->page['nav'] .= replace_macros($tpl, [ '$baseurl' => System::baseUrl(), '$sitelocation' => $nav_info['sitelocation'], @@ -57,10 +57,10 @@ class Nav '$clear_notifs' => L10n::t('Clear notifications'), '$search_hint' => L10n::t('@name, !forum, #tags, content') ]); - + Addon::callHooks('page_header', $a->page['nav']); } - + /** * Prepares a list of navigation links * @@ -75,27 +75,27 @@ class Nav private static function getInfo(App $a) { $ssl_state = ((local_user()) ? true : false); - + /* * Our network is distributed, and as you visit friends some of the * sites look exactly the same - it isn't always easy to know where you are. * Display the current site location as a navigation aid. */ - + $myident = ((is_array($a->user) && isset($a->user['nickname'])) ? $a->user['nickname'] . '@' : ''); - + $sitelocation = $myident . substr(System::baseUrl($ssl_state), strpos(System::baseUrl($ssl_state), '//') + 2); - + // nav links: array of array('href', 'text', 'extra css classes', 'title') $nav = []; - + // Display login or logout $nav['usermenu'] = []; $userinfo = null; - + if (local_user()) { $nav['logout'] = ['logout', L10n::t('Logout'), '', L10n::t('End this session')]; - + // user menu $nav['usermenu'][] = ['profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')]; $nav['usermenu'][] = ['profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')]; @@ -103,7 +103,7 @@ class Nav $nav['usermenu'][] = ['videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')]; $nav['usermenu'][] = ['events/', L10n::t('Events'), '', L10n::t('Your events')]; $nav['usermenu'][] = ['notes/', L10n::t('Personal notes'), '', L10n::t('Your personal notes')]; - + // user info $contact = dba::selectFirst('contact', ['micro'], ['uid' => $a->user['uid'], 'self' => true]); $userinfo = [ @@ -113,120 +113,116 @@ class Nav } else { $nav['login'] = ['login', L10n::t('Login'), ($a->module == 'login' ? 'selected' : ''), L10n::t('Sign in')]; } - + // "Home" should also take you home from an authenticated remote profile connection $homelink = Profile::getMyURL(); if (! $homelink) { $homelink = ((x($_SESSION, 'visitor_home')) ? $_SESSION['visitor_home'] : ''); } - + if (($a->module != 'home') && (! (local_user()))) { $nav['home'] = [$homelink, L10n::t('Home'), '', L10n::t('Home Page')]; } - + if (($a->config['register_policy'] == REGISTER_OPEN) && (! local_user()) && (! remote_user())) { $nav['register'] = ['register', L10n::t('Register'), '', L10n::t('Create an account')]; } - + $help_url = 'help'; - + if (!Config::get('system', 'hide_help')) { $nav['help'] = [$help_url, L10n::t('Help'), '', L10n::t('Help and documentation')]; } - + if (count($a->apps) > 0) { $nav['apps'] = ['apps', L10n::t('Apps'), '', L10n::t('Addon applications, utilities, games')]; } - + if (local_user() || !Config::get('system', 'local_search')) { $nav['search'] = ['search', L10n::t('Search'), '', L10n::t('Search site content')]; - + $nav['searchoption'] = [ L10n::t('Full Text'), L10n::t('Tags'), L10n::t('Contacts') ]; - + if (Config::get('system', 'poco_local_search')) { $nav['searchoption'][] = L10n::t('Forums'); } } - + $gdirpath = 'directory'; - + if (strlen(Config::get('system', 'singleuser'))) { $gdir = Config::get('system', 'directory'); if (strlen($gdir)) { $gdirpath = Profile::zrl($gdir, true); } } - + if (local_user() || Config::get('system', 'community_page_style') != CP_NO_COMMUNITY_PAGE) { $nav['community'] = ['community', L10n::t('Community'), '', L10n::t('Conversations on this and other servers')]; } - + if (local_user()) { $nav['events'] = ['events', L10n::t('Events'), '', L10n::t('Events and Calendar')]; } - + $nav['directory'] = [$gdirpath, L10n::t('Directory'), '', L10n::t('People directory')]; - + $nav['about'] = ['friendica', L10n::t('Information'), '', L10n::t('Information about this friendica instance')]; - + // The following nav links are only show to logged in users if (local_user()) { $nav['network'] = ['network', L10n::t('Network'), '', L10n::t('Conversations from your friends')]; $nav['net_reset'] = ['network/0?f=&order=comment&nets=all', L10n::t('Network Reset'), '', L10n::t('Load Network page with no filters')]; - + $nav['home'] = ['profile/' . $a->user['nickname'], L10n::t('Home'), '', L10n::t('Your posts and conversations')]; - - if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE, PAGE_PRVGROUP])) { - // only show friend requests for normal pages. Other page types have automatic friendship. - if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_PRVGROUP])) { - $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')]; - } - if (in_array($_SESSION['page_flags'], [PAGE_NORMAL, PAGE_SOAPBOX, PAGE_FREELOVE])) { - $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')]; - $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', '']; - $nav['notifications']['mark'] = ['', L10n::t('Mark as seen'), '', L10n::t('Mark all system notifications seen')]; - } + + // Don't show notifications for public communities + if ($_SESSION['page_flags'] != PAGE_COMMUNITY) { + $nav['introductions'] = ['notifications/intros', L10n::t('Introductions'), '', L10n::t('Friend Requests')]; + $nav['notifications'] = ['notifications', L10n::t('Notifications'), '', L10n::t('Notifications')]; + $nav['notifications']['all'] = ['notifications/system', L10n::t('See all notifications'), '', '']; + $nav['notifications']['mark'] = ['', L10n::t('Mark as seen'), '', L10n::t('Mark all system notifications seen')]; } - + $nav['messages'] = ['message', L10n::t('Messages'), '', L10n::t('Private mail')]; $nav['messages']['inbox'] = ['message', L10n::t('Inbox'), '', L10n::t('Inbox')]; $nav['messages']['outbox'] = ['message/sent', L10n::t('Outbox'), '', L10n::t('Outbox')]; $nav['messages']['new'] = ['message/new', L10n::t('New Message'), '', L10n::t('New Message')]; - + if (is_array($a->identities) && count($a->identities) > 1) { $nav['manage'] = ['manage', L10n::t('Manage'), '', L10n::t('Manage other pages')]; } - + $nav['delegations'] = ['delegate', L10n::t('Delegations'), '', L10n::t('Delegate Page Management')]; - + $nav['settings'] = ['settings', L10n::t('Settings'), '', L10n::t('Account settings')]; - + if (Feature::isEnabled(local_user(), 'multi_profiles')) { $nav['profiles'] = ['profiles', L10n::t('Profiles'), '', L10n::t('Manage/Edit Profiles')]; } - + $nav['contacts'] = ['contacts', L10n::t('Contacts'), '', L10n::t('Manage/edit friends and contacts')]; } - + // Show the link to the admin configuration page if user is admin if (is_site_admin()) { $nav['admin'] = ['admin/', L10n::t('Admin'), '', L10n::t('Site setup and configuration')]; } - + $nav['navigation'] = ['navigation/', L10n::t('Navigation'), '', L10n::t('Site map')]; - + // Provide a banner/logo/whatever $banner = Config::get('system', 'banner'); if (is_null($banner)) { $banner = 'logoFriendica'; } - + Addon::callHooks('nav_info', $nav); - + return [ 'sitelocation' => $sitelocation, 'nav' => $nav, @@ -234,7 +230,7 @@ class Nav 'userinfo' => $userinfo, ]; } - + /** * Set a menu item in navbar as selected */ diff --git a/src/Model/Contact.php b/src/Model/Contact.php index 48e8be3106..0bd5d06f68 100644 --- a/src/Model/Contact.php +++ b/src/Model/Contact.php @@ -423,7 +423,7 @@ class Contact extends BaseObject // Fetch the data from the gcontact table if (!DBM::is_result($r)) { $s = dba::p("SELECT 0 AS `id`, 0 AS `cid`, `id` AS `gid`, 0 AS `zid`, 0 AS `uid`, `url`, `nurl`, `alias`, `network`, `name`, `nick`, `addr`, `location`, `about`, '' AS `xmpp`, - `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, `community` AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` + `keywords`, `gender`, `photo`, `photo` AS `thumb`, `photo` AS `micro`, 0 AS `forum`, 0 AS `prv`, `community`, `contact-type`, `birthday`, 0 AS `self` FROM `gcontact` WHERE `nurl` = ?", normalise_link($url)); $r = dba::inArray($s); } diff --git a/src/Protocol/DFRN.php b/src/Protocol/DFRN.php index d1a4f0c4be..a3844a36e3 100644 --- a/src/Protocol/DFRN.php +++ b/src/Protocol/DFRN.php @@ -2923,6 +2923,9 @@ class DFRN logger("Import DFRN message for user " . $importer["importer_uid"] . " from contact " . $importer["id"], LOGGER_DEBUG); + // is it a public forum? Private forums aren't exposed with this method + $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue); + // The account type is new since 3.5.1 if ($xpath->query("/atom:feed/dfrn:account_type")->length > 0) { $accounttype = intval($xpath->evaluate("/atom:feed/dfrn:account_type/text()")->item(0)->nodeValue); @@ -2930,17 +2933,17 @@ class DFRN if ($accounttype != $importer["contact-type"]) { dba::update('contact', ['contact-type' => $accounttype], ['id' => $importer["id"]]); } - } - - // is it a public forum? Private forums aren't supported with this method - // This is deprecated since 3.5.1 - $forum = intval($xpath->evaluate("/atom:feed/dfrn:community/text()")->item(0)->nodeValue); - - if ($forum != $importer["forum"]) { + // A forum contact can either have set "forum" or "prv" - but not both + if (($accounttype == ACCOUNT_TYPE_COMMUNITY) && (($forum != $importer["forum"]) || ($forum == $importer["prv"]))) { + $condition = ['(`forum` != ? OR `prv` != ?) AND `id` = ?', $forum, !$forum, $importer["id"]]; + dba::update('contact', ['forum' => $forum, 'prv' => !$forum], $condition); + } + } elseif ($forum != $importer["forum"]) { // Deprecated since 3.5.1 $condition = ['`forum` != ? AND `id` = ?', $forum, $importer["id"]]; dba::update('contact', ['forum' => $forum], $condition); } + // We are processing relocations even if we are ignoring a contact $relocations = $xpath->query("/atom:feed/dfrn:relocate"); foreach ($relocations as $relocation) {