aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorzotlabs <mike@macgirvin.com>2019-03-18 19:09:12 -0700
committerzotlabs <mike@macgirvin.com>2019-03-18 19:09:12 -0700
commitb028667de17a122d3255b8db285866c66fda9fcf (patch)
treefa851ba9d67556491c3f3639f2a81da7a3efef0c /include/zot.php
parent136b2ae37f36d0b772166f7c8fac5a27b4b8a4d3 (diff)
downloadvolse-hubzilla-b028667de17a122d3255b8db285866c66fda9fcf.tar.gz
volse-hubzilla-b028667de17a122d3255b8db285866c66fda9fcf.tar.bz2
volse-hubzilla-b028667de17a122d3255b8db285866c66fda9fcf.zip
messagefilter enhancements, fix edge case in unsupported advisory privacy
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php8
1 files changed, 6 insertions, 2 deletions
diff --git a/include/zot.php b/include/zot.php
index c9c01103c..227d82a13 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1712,13 +1712,17 @@ function allowed_public_recips($msg) {
$condensed_recips[] = $rr['hash'];
$results = array();
- $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ",
+ $r = q("select channel_hash as hash, channel_id from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and channel_removed = 0 ",
dbesc($hash)
);
if($r) {
- foreach($r as $rr)
+ foreach($r as $rr) {
+ $cfg = get_abconfig($rr['channel_id'],$rr['hash'],'their_perms','view_stream');
+ if((! $cfg) && $scope !== 'any connections')
+ continue;
if(in_array($rr['hash'],$condensed_recips))
$results[] = array('hash' => $rr['hash']);
+ }
}
return $results;
}