aboutsummaryrefslogtreecommitdiffstats
path: root/include
diff options
context:
space:
mode:
authorfriendica <info@friendica.com>2014-12-12 00:26:07 -0800
committerfriendica <info@friendica.com>2014-12-12 00:26:07 -0800
commit452d275b5ee4575e6c763076b397e1cd2320c4bc (patch)
tree6beb56c44120b863897685b137f07751dcbca332 /include
parent7f1a42340a3f0967e23cf836b2c417a1b9b9b20b (diff)
downloadvolse-hubzilla-452d275b5ee4575e6c763076b397e1cd2320c4bc.tar.gz
volse-hubzilla-452d275b5ee4575e6c763076b397e1cd2320c4bc.tar.bz2
volse-hubzilla-452d275b5ee4575e6c763076b397e1cd2320c4bc.zip
don't import to sys channel from self-censored authors
Diffstat (limited to 'include')
-rw-r--r--include/zot.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index 44c36ebb4..c88b2a369 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -1433,9 +1433,19 @@ function process_delivery($sender,$arr,$deliveries,$relay,$public = false,$reque
$channel = $r[0];
// allow public postings to the sys channel regardless of permissions
- if(($channel['channel_pageflags'] & PAGE_SYSTEM) && (! $arr['item_private']))
+ if(($channel['channel_pageflags'] & PAGE_SYSTEM) && (! $arr['item_private'])) {
$local_public = true;
+ $r = q("select xchan_flags from xchan where xchan_hash = '%s' limit 1",
+ dbesc($sender['hash'])
+ );
+ // don't import sys channel posts from selfcensored authors
+ if($r && ($r[0]['xchan_flags'] & XCHAN_FLAGS_SELFCENSORED)) {
+ $local_public = false;
+ continue;
+ }
+ }
+
$tag_delivery = tgroup_check($channel['channel_id'],$arr);
$perm = (($arr['mid'] == $arr['parent_mid']) ? 'send_stream' : 'post_comments');