make forumlist & page respect hidden, blocked, and archived contacts

2012-10-03 18:25:46 -07:00 · 2012-10-03 18:25:46 -07:00 · afa8321d2a
parent 407c5311a8
commit afa8321d2a
5 changed files with 2 additions and 0 deletions
--- a/facebook.tgz
+++ b/facebook.tgz
--- a/forumlist.tgz
+++ b/forumlist.tgz
--- a/forumlist/forumlist.php
+++ b/forumlist/forumlist.php
@ -36,6 +36,7 @@ function forumlist_getpage($uid,$showhidden = true,$randomise = false) {

 	$contacts = q("SELECT `contact`.`id`, `contact`.`url`, `contact`.`name`, `contact`.`micro` from contact 
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
 			$order ",
 			intval($uid)
 	);
--- a/page.tgz
+++ b/page.tgz
--- a/page/page.php
+++ b/page/page.php
@ -38,6 +38,7 @@ function page_getpage($uid,$showhidden = true,$randomise = false) {

 	$contacts = q("SELECT `id`, `url`, `name`, `micro` FROM `contact`
 			WHERE `network`= 'dfrn' AND `forum` = 1 AND `uid` = %d
+			and blocked = 0 and hidden = 0 and pending = 0 and archive = 0
 			$order ",
 			intval($uid)
 	);