diff options
| author | friendica <info@friendica.com> | 2013-06-06 18:35:37 -0700 |
|---|---|---|
| committer | friendica <info@friendica.com> | 2013-06-06 18:35:37 -0700 |
| commit | c21f8c68e39e22a0348e5717109f0005d4d35809 (patch) | |
| tree | bf72ac945af5e54bb4547c80156c21487025843a | |
| parent | 1b70ac1bc03e01d080ffcd646ca2b6c44b5b9454 (diff) | |
| download | volse-hubzilla-c21f8c68e39e22a0348e5717109f0005d4d35809.tar.gz volse-hubzilla-c21f8c68e39e22a0348e5717109f0005d4d35809.tar.bz2 volse-hubzilla-c21f8c68e39e22a0348e5717109f0005d4d35809.zip | |
by default pending connections have no rights
| -rw-r--r-- | include/permissions.php | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/include/permissions.php b/include/permissions.php index a8f8d2629..071a599f8 100644 --- a/include/permissions.php +++ b/include/permissions.php @@ -98,7 +98,7 @@ function get_all_perms($uid,$observer_xchan,$internal_use = true) { // If they're blocked - they can't read or write - if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) { + if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) { $ret[$perm_name] = false; continue; } @@ -242,7 +242,7 @@ function perm_is_allowed($uid,$observer_xchan,$permission) { // If they're blocked - they can't read or write - if(($x) && ($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED)) + if(($x) && (($x[0]['abook_flags'] & ABOOK_FLAG_BLOCKED) || ($x[0]['abook_flags'] & ABOOK_FLAG_PENDING))) return false; if(($x) && (! $global_perms[$permission][2]) && ($x[0]['abook_flags'] & ABOOK_FLAG_IGNORED)) |