From aea2fa1629692cc29f1070a66fbde9fb9ae837a6 Mon Sep 17 00:00:00 2001 From: redmatrix Date: Fri, 26 Aug 2016 16:01:33 -0700 Subject: issue #186 ...different check for pubforum with expert permissions --- include/zot.php | 18 ++++++------------ 1 file changed, 6 insertions(+), 12 deletions(-) (limited to 'include/zot.php') diff --git a/include/zot.php b/include/zot.php index c3c924113..6187e8a61 100644 --- a/include/zot.php +++ b/include/zot.php @@ -3785,20 +3785,14 @@ function zotinfo($arr) { if($role === 'forum' || $role === 'repository') { $public_forum = true; } - elseif($ztarget_hash) { + else { // check if it has characteristics of a public forum based on custom permissions. - $t = q("select * from abconfig where abconfig.cat = 'my_perms' and abconfig.chan = %d and abconfig.xchan = '%s' and abconfig.k in ('tag_deliver', 'send_stream') ", - intval($e['channel_id']), - dbesc($ztarget_hash) - ); - - $ch = 0; - - if($t) { - foreach($t as $tt) { - if($tt['k'] == 'tag_deliver' && $tt['v'] == 1) + $m = \Zotlabs\Access\Permissions::FilledAutoperms($e['channel_id']); + if($m) { + foreach($m as $k => $v) { + if($k == 'tag_deliver' && intval($v) == 1) $ch ++; - if($tt['k'] == 'send_stream' && $tt['v'] == 0) + if($k == 'send_stream' && intval($v) == 0) $ch ++; } if($ch == 2) -- cgit v1.2.3