Merge remote branch 'upstream/master'

6 files changed, 119 insertions, 33 deletions

diff --git a/include/Scrape.php b/include/Scrape.php
index b20d7d604..227252600 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -282,7 +282,7 @@ function scrape_feed($url) {
 		}
 	}
 	if(! $basename)
-		$basename = substr($url,0,strrpos($url,'/')) . '/';
+		$basename = implode('/', array_slice(explode('/',$url),0,3)) . '/';
 
 	$items = $dom->getElementsByTagName('link');
 
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/enotify.php b/include/enotify.php
index 8385bdec5..ca134ac86 100644
--- a/include/enotify.php
+++ b/include/enotify.php
@@ -402,8 +402,8 @@ class enotify {
 	 */
 	static public function send($params) {
 
-		$fromName = email_header_encode($params['fromName'],'UTF-8'); 
-		$messageSubject = email_header_encode($params['messageSubject'],'UTF-8');
+		$fromName = email_header_encode(html_entity_decode($params['fromName'],ENT_QUOTES,'UTF-8'),'UTF-8'); 
+		$messageSubject = email_header_encode(html_entity_decode($params['messageSubject'],ENT_QUOTES,'UTF-8'),'UTF-8');
 		
 		// generate a mime boundary
 		$mimeBoundary   =rand(0,9)."-"
diff --git a/include/gprobe.php b/include/gprobe.php
index 26254ad28..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;
@@ -36,21 +37,25 @@ function gprobe_run($argv, $argc){
 		dbesc(normalise_link($url))
 	);
 
-	if(count($r))
-		return;
-
-	$arr = probe_url($url);
+	if(! count($r)) {
 
-	if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
-		q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
-			values ( '%s', '%s', '%s', '%s') ",
-			dbesc($arr['name']),
-			dbesc($arr['url']),
-			dbesc(normalise_link($arr['url'])),
-			dbesc($arr['photo'])
+		$arr = probe_url($url);
+		if(count($arr) && x($arr,'network') && $arr['network'] === NETWORK_DFRN) {
+			q("insert into `gcontact` (`name`,`url`,`nurl`,`photo`)
+				values ( '%s', '%s', '%s', '%s') ",
+				dbesc($arr['name']),
+				dbesc($arr['url']),
+				dbesc(normalise_link($arr['url'])),
+				dbesc($arr['photo'])
+			);
+		}
+		$r = q("select * from gcontact where nurl = '%s' limit 1",
+			dbesc(normalise_link($url))
 		);
 	}
-
+	if(count($r))
+		poco_load(0,0,$r[0]['id'], str_replace('/profile/','/poco/',$r[0]['url']));
+		
 	return;
 }
 
diff --git a/include/onepoll.php b/include/onepoll.php
index 51516d059..42bce0f68 100644
--- a/include/onepoll.php
+++ b/include/onepoll.php
@@ -506,7 +506,7 @@ function onepoll_run($argv, $argc){
 	}
 	if(count($r)) {
 		if(! $r[0]['total']) {
-			poco_load($contact['id'],$importer_uid,$contact['poco']);
+			poco_load($contact['id'],$importer_uid,0,$contact['poco']);
 		}
 	}
 
diff --git a/include/socgraph.php b/include/socgraph.php
index 3f5194049..a08d58074 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -20,7 +20,7 @@ require_once('include/datetime.php');
 
 
 
-function poco_load($cid,$uid = 0,$url = null) {
+function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 	$a = get_app();
 
 	if($cid) {
@@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$url = null) {
 	if(($a->get_curl_code() > 299) || (! $s))
 		return;
 
-
 	$j = json_decode($s);
 
 	logger('poco_load: json: ' . print_r($j,true),LOGGER_DATA);
@@ -81,7 +80,6 @@ function poco_load($cid,$uid = 0,$url = null) {
 				$connect_url = str_replace('acct:' , '', $url->value);
 				continue;
 			}
-
 		} 
 		foreach($entry->photos as $photo) {
 			if($photo->type == 'profile') {
@@ -128,34 +126,38 @@ function poco_load($cid,$uid = 0,$url = null) {
 		if(! $gcid)
 			return;
 
-		$r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d limit 1",
+		$r = q("select * from glink where `cid` = %d and `uid` = %d and `gcid` = %d and `zcid` = %d limit 1",
 			intval($cid),
 			intval($uid),
-			intval($gcid)
+			intval($gcid),
+			intval($zcid)
 		);
 		if(! count($r)) {
-			q("insert into glink ( `cid`,`uid`,`gcid`,`updated`) values (%d,%d,%d,'%s') ",
+			q("insert into glink ( `cid`,`uid`,`gcid`,`zcid`, `updated`) values (%d,%d,%d,%d, '%s') ",
 				intval($cid),
 				intval($uid),
 				intval($gcid),
+				intval($zcid),
 				dbesc(datetime_convert())
 			);
 		}
 		else {
-			q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d limit 1",
+			q("update glink set updated = '%s' where `cid` = %d and `uid` = %d and `gcid` = %d and zcid = %d limit 1",
 				dbesc(datetime_convert()),
 				intval($cid),
 				intval($uid),
-				intval($gcid)
+				intval($gcid),
+				intval($zcid)
 			);
 		}
 
 	}
 	logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
-	q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
+	q("delete from glink where `cid` = %d and `uid` = %d and `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
 		intval($cid),
-		intval($uid)
+		intval($uid),
+		intval($zcid)
 	);
 
 }
@@ -180,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`
@@ -254,7 +291,7 @@ function suggestion_query($uid, $start = 0, $limit = 80) {
 
 	$r2 = q("SELECT gcontact.* from gcontact 
 		left join glink on glink.gcid = gcontact.id 
-		where glink.uid = 0 and glink.cid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
+		where glink.uid = 0 and glink.cid = 0 and glink.zcid = 0 and not gcontact.nurl in ( select nurl from contact where uid = %d )
 		and not gcontact.name in ( select name from contact where uid = %d )
 		and not gcontact.id in ( select gcid from gcign where uid = %d )
 		order by rand() limit %d, %d ",
@@ -276,7 +313,7 @@ function update_suggestions() {
 
 	$done = array();
 
-	poco_load(0,0,$a->get_baseurl() . '/poco');
+	poco_load(0,0,0,$a->get_baseurl() . '/poco');
 
 	$done[] = $a->get_baseurl() . '/poco';
 
@@ -288,7 +325,7 @@ function update_suggestions() {
 				foreach($j->entries as $entry) {
 					$url = $entry->url . '/poco';
 					if(! in_array($url,$done))
-						poco_load(0,0,$entry->url . '/poco');
+						poco_load(0,0,0,$entry->url . '/poco');
 				}
 			}
 		}
@@ -302,7 +339,7 @@ function update_suggestions() {
 		foreach($r as $rr) {
 			$base = substr($rr['poco'],0,strrpos($rr['poco'],'/'));
 			if(! in_array($base,$done))
-				poco_load(0,0,$base);
+				poco_load(0,0,0,$base);
 		}
 	}
 }