diff options
| author | redmatrix <git@macgirvin.com> | 2016-07-09 19:03:29 -0700 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-07-09 19:03:29 -0700 |
| commit | 917a465ccd7dfa4992241b1e5d4418b3a31f1615 (patch) | |
| tree | 4743fcfc2e9997d35c1b0ef73317002c98255b64 /Zotlabs | |
| parent | e11330a5c8e5111d08d6aee1f4dc6dda6f7c7f2a (diff) | |
| download | volse-hubzilla-917a465ccd7dfa4992241b1e5d4418b3a31f1615.tar.gz volse-hubzilla-917a465ccd7dfa4992241b1e5d4418b3a31f1615.tar.bz2 volse-hubzilla-917a465ccd7dfa4992241b1e5d4418b3a31f1615.zip | |
more work on perms
Diffstat (limited to 'Zotlabs')
| -rw-r--r-- | Zotlabs/Daemon/Onepoll.php | 4 | ||||
| -rw-r--r-- | Zotlabs/Module/Follow.php | 3 |
2 files changed, 5 insertions, 2 deletions
diff --git a/Zotlabs/Daemon/Onepoll.php b/Zotlabs/Daemon/Onepoll.php index 036a4991b..21c46cec5 100644 --- a/Zotlabs/Daemon/Onepoll.php +++ b/Zotlabs/Daemon/Onepoll.php @@ -102,7 +102,9 @@ class Onepoll { $fetch_feed = true; $x = null; - if(! ($contact['abook_their_perms'] & PERMS_R_STREAM )) + $can_view_stream = intval(get_abconfig($importer_uid,$contact['abook_xchan'],'their_perms','view_stream')); + + if(! $can_view_stream) $fetch_feed = false; if($fetch_feed) { diff --git a/Zotlabs/Module/Follow.php b/Zotlabs/Module/Follow.php index 3641330c9..5de89ef41 100644 --- a/Zotlabs/Module/Follow.php +++ b/Zotlabs/Module/Follow.php @@ -49,10 +49,11 @@ class Follow extends \Zotlabs\Web\Controller { build_sync_packet(0 /* use the current local_channel */, array('abook' => array($clone))); + $can_view_stream = intval(get_abconfig($channel['channel_id'],$clone['abook_xchan'],'their_perms','view_stream')); // If we can view their stream, pull in some posts - if(($result['abook']['abook_their_perms'] & PERMS_R_STREAM) || ($result['abook']['xchan_network'] === 'rss')) + if(($can_view_stream) || ($result['abook']['xchan_network'] === 'rss')) \Zotlabs\Daemon\Master::Summon(array('Onepoll',$result['abook']['abook_id'])); goaway(z_root() . '/connedit/' . $result['abook']['abook_id'] . '?f=&follow=1'); |