From 594803afca25bf173cc42bb523a6931cc386777a Mon Sep 17 00:00:00 2001 From: friendica Date: Tue, 1 May 2012 20:33:19 -0700 Subject: reduce the scope a bit --- include/socgraph.php | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) (limited to 'include/socgraph.php') diff --git a/include/socgraph.php b/include/socgraph.php index bd1fbded5..a3e20a641 100644 --- a/include/socgraph.php +++ b/include/socgraph.php @@ -200,18 +200,14 @@ function common_friends($uid,$cid) { } -function count_common_friends_remote($uid,$cid,$zid) { +function count_common_friends_zcid($uid,$zcid) { $r = q("SELECT count(*) as `total` FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` - where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d )) - and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ", - intval($cid), - intval($zid), + where `glink`.`zcid` = %d + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ", + intval($zcid), intval($uid), - intval($uid), - intval($cid) ); if(count($r)) @@ -220,19 +216,15 @@ function count_common_friends_remote($uid,$cid,$zid) { } -function common_friends_remote($uid,$cid,$zid,$limit = 6) { +function common_friends_zcid($uid,$zcid,$limit = 6) { $r = q("SELECT `gcontact`.* FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` - where ((`glink`.cid != 0 and `glink`.`cid` = %d) or ( `glink`.`zcid` != 0 and `glink`.`zcid` = %d )) - and `glink`.`uid` = %d - and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) + where `glink`.`zcid` = %d + and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) order by `gcontact`.`name` asc limit 0, %d", - intval($cid), - intval($zid), + intval($zcid), intval($uid), - intval($uid), - intval($cid), intval($limit) ); -- cgit v1.2.3