From 43e064749cfb5cd9d4a0e64991bf297f28a3a6d4 Mon Sep 17 00:00:00 2001
From: redmatrix <redmatrix@redmatrix.me>
Date: Wed, 9 Sep 2015 18:50:15 -0700
Subject: major changes to "forum mode" on the network/matrix page

---
 mod/network.php | 11 +++++++++--
 mod/zfinger.php |  2 +-
 2 files changed, 10 insertions(+), 3 deletions(-)

(limited to 'mod')

diff --git a/mod/network.php b/mod/network.php
index d5e305687..77be7e96e 100644
--- a/mod/network.php
+++ b/mod/network.php
@@ -115,6 +115,8 @@ function network_content(&$a, $update = 0, $load = false) {
 	$file     = ((x($_GET,'file'))  ? $_GET['file']          : '');
 
 
+	$deftag = '';
+
 	if(x($_GET,'search') || x($_GET,'file'))
 		$nouveau = true;
 	if($cid) {
@@ -130,7 +132,10 @@ function network_content(&$a, $update = 0, $load = false) {
 			goaway($a->get_baseurl(true) . '/network');
 			// NOTREACHED
 		}
-		$def_acl = array('allow_cid' => '<' . $r[0]['abook_xchan'] . '>');
+		if($_GET['pf'] === '1')
+			$deftag = '@' . t('forum') . '+' . intval($cid) . '+';
+		else
+			$def_acl = array('allow_cid' => '<' . $r[0]['abook_xchan'] . '>');
 	}
 
 	if(! $update) {
@@ -164,6 +169,8 @@ function network_content(&$a, $update = 0, $load = false) {
 			'visitor'          => true,
 			'profile_uid'      => local_channel()
 		);
+		if($deftag)
+			$x['body'] = $deftag;
 
 		$status_editor = status_editor($a,$x);
 		$o .= $status_editor;
@@ -223,7 +230,7 @@ function network_content(&$a, $update = 0, $load = false) {
 		if($r) {
 			$sql_extra = " AND item.parent IN ( SELECT DISTINCT parent FROM item WHERE true $sql_options AND uid = " . intval(local_channel()) . " AND ( author_xchan = '" . dbesc($r[0]['abook_xchan']) . "' or owner_xchan = '" . dbesc($r[0]['abook_xchan']) . "' ) $item_normal ) ";
 			$title = replace_macros(get_markup_template("section_title.tpl"),array(
-				'$title' => t('Connection: ') . $r[0]['xchan_name']
+				'$title' => (($_GET['pf'] === '1') ? t('Forum: ') : t('Connection: ')) . $r[0]['xchan_name']
 			));
 			$o = $tabs;
 			$o .= $title;
diff --git a/mod/zfinger.php b/mod/zfinger.php
index ba80fc9b6..54ea52bc9 100644
--- a/mod/zfinger.php
+++ b/mod/zfinger.php
@@ -116,7 +116,7 @@ function zfinger_init(&$a) {
 		$t = q("select abook_my_perms from abook where abook_channel = %d and abook_self = 1 limit 1",
 			intval($e['channel_id'])
 		);
-		if($t && ($t[0]['abook_my_perms'] & PERMS_W_TAGWALL))
+		if(($t) && (($t[0]['abook_my_perms'] & PERMS_W_TAGWALL) && (! ($t[0]['abook_my_perms'] & PERMS_W_STREAM))))
 			$public_forum = true;
 	}
 
-- 
cgit v1.2.3