diff options
| author | zottel <github@zottel.net> | 2014-02-19 08:30:14 +0100 |
|---|---|---|
| committer | zottel <github@zottel.net> | 2014-02-19 08:30:14 +0100 |
| commit | 79d3dae7fa80df6ea6914807bcde4d8b8c390361 (patch) | |
| tree | 96327bd990038c66f0e644c505522cb424a1bbd0 /include/permissions.php | |
| parent | 2bca2199112625593eb412584e17e874e71ca913 (diff) | |
| parent | 24d119b8c4e94ed130577e4e4a8d17ea13c406ac (diff) | |
| download | volse-hubzilla-79d3dae7fa80df6ea6914807bcde4d8b8c390361.tar.gz volse-hubzilla-79d3dae7fa80df6ea6914807bcde4d8b8c390361.tar.bz2 volse-hubzilla-79d3dae7fa80df6ea6914807bcde4d8b8c390361.zip | |
Merge remote-tracking branch 'upstream/master'
Diffstat (limited to 'include/permissions.php')
| -rw-r--r-- | include/permissions.php | 21 |
1 files changed, 15 insertions, 6 deletions
diff --git a/include/permissions.php b/include/permissions.php index 420591c54..eb1a7966f 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -88,8 +88,13 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // These take priority over all other settings. if($observer_xchan) { + if($r[0][$channel_perm] & PERMS_AUTHED) { + $ret[$perm_name] = true; + continue; + } + if(! $abook_checked) { - $x = q("select abook_my_perms, abook_flags from abook + $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1", intval($uid), dbesc($observer_xchan), @@ -137,9 +142,9 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { continue; } - // If we're still here, we have an observer, which means they're in the network. + // If we're still here, we have an observer, check the network. - if($r[0][$channel_perm] & PERMS_NETWORK) { + if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot')) { $ret[$perm_name] = true; continue; } @@ -240,7 +245,11 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { return false; if($observer_xchan) { - $x = q("select abook_my_perms, abook_flags from abook where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1", + if($r[0][$channel_perm] & PERMS_AUTHED) + return true; + + $x = q("select abook_my_perms, abook_flags, xchan_network from abook left join xchan on abook_xchan = xchan_hash + where abook_channel = %d and abook_xchan = '%s' and not ( abook_flags & %d ) limit 1", intval($uid), dbesc($observer_xchan), intval(ABOOK_FLAG_SELF) @@ -272,9 +281,9 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { return false; } - // If we're still here, we have an observer, which means they're in the network. + // If we're still here, we have an observer, check the network. - if($r[0][$channel_perm] & PERMS_NETWORK) + if(($r[0][$channel_perm] & PERMS_NETWORK) && ($x[0]['xchan_network'] === 'zot')) return true; |