aboutsummaryrefslogtreecommitdiffstats
path: root/include/widgets.php
diff options
context:
space:
mode:
authorredmatrix <git@macgirvin.com>2016-07-12 21:47:24 -0700
committerredmatrix <git@macgirvin.com>2016-07-12 21:47:24 -0700
commitf4e4e734de001de50b2a1a3119997b444bf12134 (patch)
treeec7d33b651aa7da3d6edc3b9026bb351fadb6da2 /include/widgets.php
parent6424bac47ce7f81991d23d2407cbb4c08dbfdf69 (diff)
downloadvolse-hubzilla-f4e4e734de001de50b2a1a3119997b444bf12134.tar.gz
volse-hubzilla-f4e4e734de001de50b2a1a3119997b444bf12134.tar.bz2
volse-hubzilla-f4e4e734de001de50b2a1a3119997b444bf12134.zip
more work on perms
Diffstat (limited to 'include/widgets.php')
-rw-r--r--include/widgets.php11
1 files changed, 8 insertions, 3 deletions
diff --git a/include/widgets.php b/include/widgets.php
index 2d4d5b799..dbcaef409 100644
--- a/include/widgets.php
+++ b/include/widgets.php
@@ -1347,9 +1347,14 @@ function widget_forums($arr) {
$perms_sql = item_permissions_sql(local_channel()) . item_normal();
- $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where ( xchan_pubforum = 1 or ((abook_their_perms & %d ) != 0 and (abook_their_perms & %d ) = 0) ) and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
- intval(PERMS_W_TAGWALL),
- intval(PERMS_W_STREAM),
+ /**
+ * We used to try and find public forums with custom permissions by checking to see if
+ * send_stream was false and tag_deliver was true. However with the newer extensible
+ * permissions infrastructure this makes for a very complicated query. Now we're only
+ * checking channels that report themselves specifically as pubforums
+ */
+
+ $r1 = q("select abook_id, xchan_hash, xchan_name, xchan_url, xchan_photo_s from abook left join xchan on abook_xchan = xchan_hash where xchan_pubforum = 1 and xchan_deleted = 0 and abook_channel = %d order by xchan_name $limit ",
intval(local_channel())
);
if(! $r1)