From f31ff2b0610655676ce2c28a77107abcf34c074b Mon Sep 17 00:00:00 2001
From: Tobias Diekershoff <tobias.diekershoff@gmx.net>
Date: Sat, 8 Dec 2012 09:12:44 +0100
Subject: [PATCH] fixing bug 485, making private forums visible in forumlist in
 the network tab but not in the profile

---
 forumlist/forumlist.php | 19 ++++++++++++++-----
 1 file changed, 14 insertions(+), 5 deletions(-)

diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 3a682446..4ca06385 100644
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@@ -26,16 +26,20 @@ function forumlist_uninstall() {
 }
 
 
-function forumlist_getpage($uid,$showhidden = true,$randomise = false) {
+function forumlist_getpage($uid,$showhidden = true,$randomise = false, $showprivate = false) {
 
 
 	$forumlist = array();
 
 	$order = (($showhidden) ? '' : " and hidden = 0 ");
-	$order .= (($randomise) ? ' order by rand() ' : ' order by name asc ');
+        $order .= (($randomise) ? ' order by rand() ' : ' order by name asc ');
+        $select = "`forum` = 1";
+        if ($showprivate) {
+            $select = "( `forum` = 1 OR `prv` = 1 )";
+        }
 
 	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` from contact 
-			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			WHERE `network`= 'dfrn' AND $select AND `uid` = %d
 			and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
 			$order ",
 			intval($uid)
@@ -66,7 +70,7 @@ function forumlist_network_mod_init($a,$b) {
 
 	$randomise = intval(get_pconfig(local_user(),'forumlist','randomise'));
 
-	$contacts = forumlist_getpage($a->user['uid'],true,$randomise);
+	$contacts = forumlist_getpage($a->user['uid'],true,$randomise, true);
 
 	if(count($contacts)) {
 		foreach($contacts as $contact) {
@@ -99,7 +103,7 @@ function forumlist_profile_advanced($a,&$b) {
 
 	$randomise = true;
 
-	$contacts = forumlist_getpage($a->user['uid'],false,$randomise);
+	$contacts = forumlist_getpage($a->user['uid'],false,$randomise,false);
 
 	$total_shown = 0;
 	$more = false;
@@ -120,9 +124,14 @@ function forumlist_profile_advanced($a,&$b) {
 
 
 function forumlist_plugin_settings_post($a,$post) {
+
+        logger('forum list save 1');
+
 	if(! local_user() || (! x($_POST,'forumlist-settings-submit')))
 		return;
 
+        logger('forum list save 2');
+
 //	set_pconfig(local_user(),'forumlist','max_forumlists',intval($_POST['forumlist_max_forumlists']));
 	set_pconfig(local_user(),'forumlist','randomise',intval($_POST['forumlist_random']));
 	set_pconfig(local_user(),'forumlist','show_on_profile',intval($_POST['forumlist_profile']));
-- 
2.20.1