Merge pull request #112 from tobiasd/master

[friendica-addons.git] / page / page.php

diff --git a/page/page.php b/page/page.php
index 6d0044e06a18e061d19d563e609d7c68bd716c35..21a83e16d48126d96e061d40136b0c55f3e357c1 100755 (executable)
--- a/page/page.php
+++ b/page/page.php
@@ -1,7 +1,7 @@
 <?php
 /**
  * Name: Page
- * Description: Shows list of subscribed community pages/forums on network sidebar
+ * Description: This addon is now deprecated.  Administrators should switch to forumlist instead.  Developers should also add any functionality to forumlist instead of here.
  * Version: 1.0
  * Author: Mike Macgirvin <mike@macgirvin.com>
  * based on pages plugin by
@@ -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)
        );
@@ -129,7 +130,9 @@ function page_profile_advanced($a,&$b) {
                        <div class="title">'.t("Forums:").'</div>
                        <div id="profile-page-list">';
 
-       $show_total = 6;
+       // place holder in case somebody wants configurability
+       $show_total = 9999;
+
        $randomise = true;
 
        $contacts = page_getpage($a->user['uid'],false,$randomise);