keith/friendica
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

reduce the scope a bit

Browse source
This commit is contained in:
friendica 2012-05-01 20:33:19 -07:00
parent 066d69b21c
commit 594803afca
2 changed files with 11 additions and 19 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/contact_widgets.php
View file

@ -154,17 +154,17 @@ function common_friends_visitor_widget($profile_uid) {
} }
} }
if($cid == 0 && $zcid == 0) if($zcid == 0)
return; return;
require_once('include/socgraph.php'); require_once('include/socgraph.php');
$t = count_common_friends_remote($profile_uid,$cid,$zcid); $t = count_common_friends_zcid($profile_uid,$zcid);
if(! $t) if(! $t)
return; return;
$r = common_friends_remote($profile_uid,$cid,$zcid); $r = common_friends_zcid($profile_uid,$zcid);
return replace_macros(get_markup_template('remote_friends_common.tpl'), array( return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
'$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t), '$desc' => sprintf( tt("%d friend in common", "%d friends in common", $t), $t),

24
include/socgraph.php
View file

@ -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` $r = q("SELECT count(*) as `total`
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` 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 )) where `glink`.`zcid` = %d
and `glink`.`uid` = %d and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ",
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) ", intval($zcid),
intval($cid),
intval($zid),
intval($uid), intval($uid),
intval($uid),
intval($cid)
); );
if(count($r)) 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`.* $r = q("SELECT `gcontact`.*
FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id` 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 )) where `glink`.`zcid` = %d
and `glink`.`uid` = %d and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 )
and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d )
order by `gcontact`.`name` asc limit 0, %d", order by `gcontact`.`name` asc limit 0, %d",
intval($cid), intval($zcid),
intval($zid),
intval($uid), intval($uid),
intval($uid),
intval($cid),
intval($limit) intval($limit)
); );