link socgraph to zrls

2 files changed, 21 insertions, 25 deletions

diff --git a/include/gprobe.php b/include/gprobe.php
index 26254ad28..fdf786ca8 100644
--- a/include/gprobe.php
+++ b/include/gprobe.php
@@ -36,21 +36,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/socgraph.php b/include/socgraph.php
index 4ab378098..4a1c8a1ca 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -53,7 +53,6 @@ function poco_load($cid,$uid = 0,$zcid = 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,$zcid = 0,$url = null) {
 				$connect_url = str_replace('acct:' , '', $url->value);
 				continue;
 			}
-
 		} 
 		foreach($entry->photos as $photo) {
 			if($photo->type == 'profile') {
@@ -156,17 +154,11 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 	}
 	logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
-	if($zcid) {
-		q("delete from glink where `zcid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 14 DAY",
-			intval($zcid)
-		);
-	}
-	else {
-		q("delete from glink where `cid` = %d and `uid` = %d and `updated` < UTC_TIMESTAMP - INTERVAL 2 DAY",
-			intval($cid),
-			intval($uid)
-		);
-	}
+	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($zcid)
+	);
 
 }