diff options
Diffstat (limited to 'include/security.php')
| -rw-r--r-- | include/security.php | 16 |
1 files changed, 10 insertions, 6 deletions
diff --git a/include/security.php b/include/security.php index f52615357..282c8ab73 100644 --- a/include/security.php +++ b/include/security.php @@ -346,8 +346,10 @@ function stream_perms_api_uids($perms_min = PERMS_SITE) { $ret = array(); if(local_user()) $ret[] = local_user(); - $r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d", - intval($perms_min) + $r = q("select channel_id from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d) and not (channel_pageflags & %d)", + intval($perms_min), + intval(PAGE_CENSORED), + intval(PAGE_SYSTEM) ); if($r) foreach($r as $rr) @@ -361,7 +363,7 @@ function stream_perms_api_uids($perms_min = PERMS_SITE) { $str .= ','; $str .= intval($rr); } -logger('stream_perms_api_uids: ' . $str); +logger('stream_perms_api_uids: ' . $str, LOGGER_DEBUG); return $str; } @@ -370,8 +372,10 @@ function stream_perms_xchans($perms_min = PERMS_SITE) { if(local_user()) $ret[] = get_observer_hash(); - $r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d", - intval($perms_min) + $r = q("select channel_hash from channel where channel_r_stream > 0 and channel_r_stream <= %d and not (channel_pageflags & %d) and not (channel_pageflags & %d)", + intval($perms_min), + intval(PAGE_CENSORED), + intval(PAGE_SYSTEM) ); if($r) foreach($r as $rr) @@ -385,6 +389,6 @@ function stream_perms_xchans($perms_min = PERMS_SITE) { $str .= ','; $str .= "'" . dbesc($rr) . "'"; } -logger('stream_perms_xchans: ' . $str); +logger('stream_perms_xchans: ' . $str, LOGGER_DEBUG); return $str; } |