Merge branch 'master', remote-tracking branch 'remotes/upstream/master'

* remotes/upstream/master:
  final touches - show friends in common with total strangers from different sites
  fix size
  cross fingers
  reduce the scope a bit
  add template
  fn not found
  really fat fingers today - though none of this has gone further than my own site
  another one
  typo
  first try common friends for visitors

* master:

6 files changed, 109 insertions, 4 deletions

diff --git a/include/contact_widgets.php b/include/contact_widgets.php
index 96b02f293..cfe27c5c9 100644
--- a/include/contact_widgets.php
+++ b/include/contact_widgets.php
@@ -133,3 +133,47 @@ function categories_widget($baseurl,$selected = '') {
 	));
 }
 
+function common_friends_visitor_widget($profile_uid) {
+
+	$a = get_app();
+
+	if(local_user() == $profile_uid)
+		return;
+
+	$cid = $zcid = 0;
+
+	if(can_write_wall($a,$profile_uid))
+		$cid = local_user();
+	else {
+		if(get_my_url()) {
+			$r = q("select id from gcontact where nurl = '%s' limit 1",
+				dbesc(normalise_link(get_my_url()))
+			);
+			if(count($r))
+				$zcid = $r[0]['id'];
+		}
+	}
+
+	if($cid == 0 && $zcid == 0)
+		return; 
+
+	require_once('include/socgraph.php');
+
+	if($cid)
+		$t = count_common_friends($profile_uid,$cid);
+	else
+		$t = count_common_friends($profile_uid,$cid);
+	if(! $t)
+		return;
+
+	if($cid)
+		$r = common_friends($profile_uid,$cid,5);
+	else
+		$r = common_friends_zcid($profile_uid,$zcid);
+
+	return replace_macros(get_markup_template('remote_friends_common.tpl'), array(
+		'$desc' =>  sprintf( tt("%d friend in common", "%d friends in common", $t), $t),
+		'$items' => $r
+	)); 
+
+};
\ No newline at end of file
diff --git a/include/gprobe.php b/include/gprobe.php
index fdf786ca8..5ca42729a 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -2,6 +2,7 @@
 
 require_once("boot.php");
 require_once('include/Scrape.php');
+require_once('include/socgraph.php');
 
 function gprobe_run($argv, $argc){
 	global $a, $db;
diff --git a/include/socgraph.php b/include/socgraph.php
index 4a1c8a1ca..a08d58074 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -182,23 +182,58 @@ function count_common_friends($uid,$cid) {
 }
 
 
-function common_friends($uid,$cid) {
+function common_friends($uid,$cid,$limit=9999) {
 
 	$r = q("SELECT `gcontact`.* 
 		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
 		where `glink`.`cid` = %d and `glink`.`uid` = %d
 		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 and id != %d ) 
-		order by `gcontact`.`name` asc ",
+		order by `gcontact`.`name` asc limit 0, %d",
 		intval($cid),
 		intval($uid),
 		intval($uid),
-		intval($cid)
+		intval($cid),
+		intval($limit)
 	);
 
 	return $r;
 
 }
 
+
+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`.`zcid` = %d
+		and `gcontact`.`nurl` in (select nurl from contact where uid = %d and self = 0 ) ",
+		intval($zcid),
+		intval($uid)
+	);
+
+	if(count($r))
+		return $r[0]['total'];
+	return 0;
+
+}
+
+function common_friends_zcid($uid,$zcid,$limit = 6) {
+
+	$r = q("SELECT `gcontact`.* 
+		FROM `glink` left join `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		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($zcid),
+		intval($uid),
+		intval($limit)
+	);
+
+	return $r;
+
+}
+
+
 function count_all_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
diff --git a/mod/profile.php b/mod/profile.php
index e9d4ca344..69f044e89 100644
--- a/mod/profile.php
+++ b/mod/profile.php
@@ -143,6 +143,10 @@ function profile_content(&$a, $update = 0) {
 			return $o;
 		}
 
+
+		$o .= common_friends_visitor_widget($a->profile['profile_uid']);
+
+
 		if(x($_SESSION,'new_member') && $_SESSION['new_member'] && $is_owner)
 			$o .= '<a href="newmember" id="newmember-tips" style="font-size: 1.2em;"><b>' . t('Tips for New Members') . '</b></a>' . EOL;
 
diff --git a/view/match.tpl b/view/match.tpl
index 5f2fc7a30..b052845ae 100644
--- a/view/match.tpl
+++ b/view/match.tpl
@@ -13,4 +13,4 @@
 	<div class="profile-match-connect"><a href="$connlnk" title="$conntxt">$conntxt</a></div>
 	{{ endif }}
 
-</div>
\ No newline at end of file
+</div>
diff --git a/view/remote_friends_common.tpl b/view/remote_friends_common.tpl
new file mode 100644
index 000000000..a5a36b137
--- /dev/null
+++ b/view/remote_friends_common.tpl
@@ -0,0 +1,21 @@
+<div id="remote-friends-in-common" class="bigwidget">
+	<div id="rfic-desc">$desc</div>
+	{{ if $items }}
+	{{ for $items as $item }}
+	<div class="profile-match-wrapper">
+		<div class="profile-match-photo">
+			<a href="$item.url">
+				<img src="$item.photo" width="80" height="80" alt="$item.name" title="$item.name" />
+			</a>
+		</div>
+		<div class="profile-match-break"></div>
+		<div class="profile-match-name">
+			<a href="$itemurl" title="$item.name">$item.name</a>
+		</div>
+		<div class="profile-match-end"></div>
+	</div>
+	{{ endfor }}
+	{{ endif }}
+	<div id="rfic-end" class="clear"></div>
+</div>
+