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

diff --git a/facebook.tgz b/facebook.tgz
index e41ee188470b37de09bfbce1f2d7c19241989d86..c1a69fdd8a9de8759e672053d0544d4fa42d338e 100644 (file)
Binary files a/facebook.tgz and b/facebook.tgz differ

diff --git a/forumlist.tgz b/forumlist.tgz
index e617eb2874115e35857c1787d25cfeaa05ab7a66..3ced1d9df688da46d9b4e21f4872a6883b0bd343 100644 (file)
Binary files a/forumlist.tgz and b/forumlist.tgz differ

diff --git a/forumlist/forumlist.php b/forumlist/forumlist.php
index 3fc622dada00ab5c47a8ed489c6f0ffb5a114cf5..332ac2783cf9d14fa76e9202d8ae3654177abb23 100644 (file)
--- 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)
        );

diff --git a/page.tgz b/page.tgz
index d300a3e2db7b5004167b96a86077e4e3aea349e0..21dab7b94164c7f51f9eff6ecd4071c44243b550 100644 (file)
Binary files a/page.tgz and b/page.tgz differ

diff --git a/page/page.php b/page/page.php
index 3f0f0419011f233d83fac97ca4956d674d5f7591..0e00909800f28ef72d505319360a91bf44395dd8 100755 (executable)
--- 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)
        );