diff options
author | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
---|---|---|
committer | zottel <github@zottel.net> | 2014-02-17 08:17:47 +0100 |
commit | 2bca2199112625593eb412584e17e874e71ca913 (patch) | |
tree | c6679ddb544217a10d8255578009c4ba8951bc6b /include/zot.php | |
parent | 54727d3a66df92596378ea7f5c412d5e6037b037 (diff) | |
parent | f38ab0904101366bf536d46ab460dcd5cf4f60ca (diff) | |
download | volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.gz volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.tar.bz2 volse-hubzilla-2bca2199112625593eb412584e17e874e71ca913.zip |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/zot.php')
-rw-r--r-- | include/zot.php | 12 |
1 files changed, 7 insertions, 5 deletions
diff --git a/include/zot.php b/include/zot.php index 21eef073c..c9d426cc2 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1064,7 +1064,9 @@ function zot_import($arr, $sender_url) { } stringify_array_elms($recip_arr); $recips = implode(',',$recip_arr); - $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) "); + $r = q("select channel_hash as hash from channel where channel_hash in ( " . $recips . " ) and not ( channel_pageflags & %d ) ", + intval(PAGE_REMOVED) + ); if(! $r) { logger('recips: no recipients on this site'); continue; @@ -1222,8 +1224,7 @@ function public_recips($msg) { if(! $r) $r = array(); - $x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' - and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ", + $x = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & " . PAGE_REMOVED . " ) and (( " . $col . " & " . PERMS_SPECIFIC . " ) and ( abook_my_perms & " . $field . " )) OR ( " . $col . " & " . PERMS_CONTACTS . " ) ", dbesc($msg['notify']['sender']['hash']) ); @@ -1304,8 +1305,9 @@ 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' ", - dbesc($hash) + $r = q("select channel_hash as hash from channel left join abook on abook_channel = channel_id where abook_xchan = '%s' and not ( channel_pageflags & %d ) ", + dbesc($hash), + intval(PAGE_REMOVED) ); if($r) { foreach($r as $rr) |