diff options
| author | Mario Vavti <mario@mariovavti.com> | 2018-06-25 14:29:32 +0200 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2018-06-25 14:29:32 +0200 |
| commit | 62610b5ec0bfe5edffc073eb06c609f33464d34f (patch) | |
| tree | 7e9c0255eadcb88c0d4146de669bdf74835915ea /Zotlabs/Storage/Directory.php | |
| parent | 259417815820d85deadaf90f6c0ed003880f373f (diff) | |
| parent | 07f004342848c633c8108f97238eff2c8eb1658b (diff) | |
| download | volse-hubzilla-62610b5ec0bfe5edffc073eb06c609f33464d34f.tar.gz volse-hubzilla-62610b5ec0bfe5edffc073eb06c609f33464d34f.tar.bz2 volse-hubzilla-62610b5ec0bfe5edffc073eb06c609f33464d34f.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'Zotlabs/Storage/Directory.php')
| -rw-r--r-- | Zotlabs/Storage/Directory.php | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/Zotlabs/Storage/Directory.php b/Zotlabs/Storage/Directory.php index 73548fda0..642af6300 100644 --- a/Zotlabs/Storage/Directory.php +++ b/Zotlabs/Storage/Directory.php @@ -722,14 +722,13 @@ class Directory extends DAV\Node implements DAV\ICollection, DAV\IQuota, DAV\IMo function ChannelList(&$auth) { $ret = array(); - $r = q("SELECT channel_id, channel_address FROM channel WHERE channel_removed = 0 - AND channel_system = 0 AND (channel_pageflags & %d) = 0", + $r = q("SELECT channel_id, channel_address, profile.publish FROM channel left join profile on profile.uid = channel.channel_id WHERE channel_removed = 0 AND channel_system = 0 AND (channel_pageflags & %d) = 0", intval(PAGE_HIDDEN) ); if ($r) { foreach ($r as $rr) { - if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage')) { + if (perm_is_allowed($rr['channel_id'], $auth->observer, 'view_storage') && $rr['publish']) { logger('found channel: /cloud/' . $rr['channel_address'], LOGGER_DATA); // @todo can't we drop '/cloud'? It gets stripped off anyway in RedDirectory $ret[] = new Directory('/cloud/' . $rr['channel_address'], $auth); |