From c21f8c68e39e22a0348e5717109f0005d4d35809 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 6 Jun 2013 18:35:37 -0700 Subject: by default pending connections have no rights --- include/permissions.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'include') 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)) -- cgit v1.2.3