From 8b8187ee9cdc828ca3a977753ef010e1fa8ebc54 Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Fri, 25 Jan 2019 19:37:37 +0100
Subject: [PATCH 1/6] added nofilter to banner in smoothy and quaddro

---
 view/theme/quattro/templates/nav.tpl  | 2 +-
 view/theme/smoothly/templates/nav.tpl | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/view/theme/quattro/templates/nav.tpl b/view/theme/quattro/templates/nav.tpl
index f002e72fe..cb5412c16 100644
--- a/view/theme/quattro/templates/nav.tpl
+++ b/view/theme/quattro/templates/nav.tpl
@@ -2,7 +2,7 @@
 	{{* {{$langselector}} *}}
 
 	<div id="site-location">{{$sitelocation}}</div>
-	<div id="banner">{{$banner}}</div>
+	<div id="banner">{{$banner nofilter}}</div>
 </header>
 <nav>
 	<ul>
diff --git a/view/theme/smoothly/templates/nav.tpl b/view/theme/smoothly/templates/nav.tpl
index 0c55b5886..757371677 100644
--- a/view/theme/smoothly/templates/nav.tpl
+++ b/view/theme/smoothly/templates/nav.tpl
@@ -1,6 +1,6 @@
 
 <nav>
-	<span id="banner">{{$banner}}</span>
+	<span id="banner">{{$banner nofilter}}</span>
 
 	<div id="notifications">	
 		{{if $nav.network}}<a id="net-update" class="nav-ajax-update" href="{{$nav.network.0}}" title="{{$nav.network.1}}"></a>{{/if}}

From 0564e710f0451b9bce8e165d67c859b1223b86f9 Mon Sep 17 00:00:00 2001
From: Aditoo17 <42938951+Aditoo17@users.noreply.github.com>
Date: Sat, 26 Jan 2019 10:51:20 +0100
Subject: [PATCH 2/6] Replace help/guide with help/Quick-Start-guide

---
 mod/newmember.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/mod/newmember.php b/mod/newmember.php
index c2ffe6464..b1eda7a2d 100644
--- a/mod/newmember.php
+++ b/mod/newmember.php
@@ -15,7 +15,7 @@ function newmember_content(App $a)
 	$o .= L10n::t('We would like to offer some tips and links to help make your experience enjoyable. Click any item to visit the relevant page. A link to this page will be visible from your home page for two weeks after your initial registration and then will quietly disappear.');
 	$o .= '<h4>' . L10n::t('Getting Started') . '</h4>';
 	$o .= '<ul>';
-	$o .= '<li> ' . '<a target="newmember" href="help/guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
+	$o .= '<li> ' . '<a target="newmember" href="help/Quick-Start-guide">' . L10n::t('Friendica Walk-Through') . '</a><br />' . L10n::t('On your <em>Quick Start</em> page - find a brief introduction to your profile and network tabs, make some new connections, and find some groups to join.') . '</li>' . EOL;
 	$o .= '</ul>';
 	$o .= '<h4>' . L10n::t('Settings') . '</h4>';
 	$o .= '<ul>';

From ad782b55efa767d77cefd16b04447ee801c2fec3 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 26 Jan 2019 12:03:09 +0000
Subject: [PATCH 3/6] Preparation for forum posts over AP

---
 src/Module/Objects.php | 6 +++++-
 1 file changed, 5 insertions(+), 1 deletion(-)

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3f8aea0d0..3aa8c9e21 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,11 +31,15 @@ class Objects extends BaseModule
 		/// @todo Add Authentication to enable fetching of non public content
 		// $requester = HTTPSignature::getSigner('', $_SERVER);
 
-		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
+		$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
 		if (!DBA::isResult($item)) {
 			System::httpExit(404);
 		}
 
+		if (!strstr($item['author-link'], System::baseUrl())) {
+			System::httpExit(404);
+		}
+
 		$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);
 
 		header('Content-Type: application/activity+json');

From 9f2e9dfc1ba0e4b27d2608757f01d27a2283b7c7 Mon Sep 17 00:00:00 2001
From: Michael <heluecht@pirati.ca>
Date: Sat, 26 Jan 2019 12:09:38 +0000
Subject: [PATCH 4/6] Fetchting the original post at first, then the other way
 is dafer.

---
 src/Module/Objects.php | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/src/Module/Objects.php b/src/Module/Objects.php
index 3aa8c9e21..558b27491 100644
--- a/src/Module/Objects.php
+++ b/src/Module/Objects.php
@@ -31,13 +31,14 @@ class Objects extends BaseModule
 		/// @todo Add Authentication to enable fetching of non public content
 		// $requester = HTTPSignature::getSigner('', $_SERVER);
 
-		$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+		// At first we try the original post with that guid
+		$item = Item::selectFirst(['id'], ['guid' => $a->argv[1], 'origin' => true, 'private' => false]);
 		if (!DBA::isResult($item)) {
-			System::httpExit(404);
-		}
-
-		if (!strstr($item['author-link'], System::baseUrl())) {
-			System::httpExit(404);
+			// If no original post could be found, it could possibly be a forum post, there we remove the "origin" field.
+			$item = Item::selectFirst(['id', 'author-link'], ['guid' => $a->argv[1], 'private' => false]);
+			if (!DBA::isResult($item) || !strstr($item['author-link'], System::baseUrl())) {
+				System::httpExit(404);
+			}
 		}
 
 		$data = ActivityPub\Transmitter::createObjectFromItemID($item['id']);

From 7918e4109780d674084468998d47a0dd67bcb483 Mon Sep 17 00:00:00 2001
From: Peter Liebetrau <peter.liebetrau@gmail.com>
Date: Sat, 26 Jan 2019 20:15:56 +0100
Subject: [PATCH 5/6] frio - fixed bug in user menu for remote user - see issue
 #6495

---
 view/theme/frio/theme.php | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index d177e81d3..d51c346c6 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -237,6 +237,7 @@ 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'",
@@ -257,10 +258,10 @@ function frio_remote_nav($a, &$nav)
 		$nav['logout'] = [$server_url . '/logout', L10n::t('Logout'), '', L10n::t('End this session')];
 
 		// user menu
-		$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'], L10n::t('Status'), '', L10n::t('Your posts and conversations')];
-		$nav['usermenu'][] = [$server_url . '/profile/' . $a->user['nickname'] . '?tab=profile', L10n::t('Profile'), '', L10n::t('Your profile page')];
-		$nav['usermenu'][] = [$server_url . '/photos/' . $a->user['nickname'], L10n::t('Photos'), '', L10n::t('Your photos')];
-		$nav['usermenu'][] = [$server_url . '/videos/' . $a->user['nickname'], L10n::t('Videos'), '', L10n::t('Your videos')];
+		$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')];
+		$nav['usermenu'][] = [$server_url . '/photos/' . $remoteUser['nick'], L10n::t('Photos'), '', L10n::t('Your photos')];
+		$nav['usermenu'][] = [$server_url . '/videos/' . $remoteUser['nick'], L10n::t('Videos'), '', L10n::t('Your videos')];
 		$nav['usermenu'][] = [$server_url . '/events/', L10n::t('Events'), '', L10n::t('Your events')];
 
 		// navbar links

From 189e17908896b6d5f77ad085cba4923d53f368c6 Mon Sep 17 00:00:00 2001
From: Peter Liebetrau <peter.liebetrau@gmail.com>
Date: Sat, 26 Jan 2019 23:02:23 +0100
Subject: [PATCH 6/6] frio - fixed bug in user menu for visitors - see
 after-merge discussion in #6526

---
 view/theme/frio/theme.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/view/theme/frio/theme.php b/view/theme/frio/theme.php
index d51c346c6..0487cc733 100644
--- a/view/theme/frio/theme.php
+++ b/view/theme/frio/theme.php
@@ -243,6 +243,7 @@ function frio_remote_nav($a, &$nav)
 				WHERE `addr` = '%s' AND `network` = 'dfrn'",
 			DBA::escape($webbie));
 		$nav['remote'] = L10n::t('Visitor');
+		$remoteUser = $r[0];
 	} else {
 		$r = false;
 	}