From f7ff2de1321ede230555b1c717a70608246afc85 Mon Sep 17 00:00:00 2001 From: friendica Date: Thu, 29 Nov 2012 23:06:03 -0800 Subject: add pending check on group queries --- include/zot.php | 14 ++++++++------ 1 file changed, 8 insertions(+), 6 deletions(-) (limited to 'include/zot.php') diff --git a/include/zot.php b/include/zot.php index 88568f09f..d098b1350 100644 --- a/include/zot.php +++ b/include/zot.php @@ -248,20 +248,22 @@ function zot_refresh($them,$channel = null) { $their_perms = $their_perms | intval($global_perms[$k][1]); } } -dbg(1); - $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) limit 1", + + $r = q("select * from abook where abook_xchan = '%s' and abook_channel = %d and not (abook_flags & %d) and not ( abook_flags & %d) limit 1", dbesc($x['hash']), intval($channel['channel_id']), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if($r) { $y = q("update abook set abook_their_perms = %d where abook_xchan = '%s' and abook_channel = %d - and not (abook_flags & %d) limit 1", + and not (abook_flags & %d) and not ( abook_flags & %d) limit 1", intval($their_perms), dbesc($x['hash']), intval($channel['channel_id']), - intval(ABOOK_FLAG_SELF) + intval(ABOOK_FLAG_SELF), + intval(ABOOK_FLAG_PENDING) ); if(! $y) logger('abook update failed'); @@ -279,7 +281,7 @@ dbg(1); if($y) logger("New introduction received for {$channel['channel_name']}"); } -dbg(0); + } return true; -- cgit v1.2.3