X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=69d33089869dbc7b8acd574904d81b39fd1651e0;hb=620299dc2571da46c9578f99f743477c7a4b4a4a;hp=9ccae5040543575092c8e50816143b1288cad8b3;hpb=3622f1a335998c8052be78d83b1e18708a509bbe;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 9ccae50405..69d3308986 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -4,6 +4,13 @@ require_once('include/datetime.php');
 require_once("include/Scrape.php");
 require_once("include/html2bbcode.php");
 
+/*
+ To-Do:
+ - Move GNU Social URL schemata (http://server.tld/user/number) to http://server.tld/username
+ - Fetch profile data from profile page for Redmatrix users
+ - Detect if it is a forum
+*/
+
 /*
  * poco_load
  *
@@ -164,9 +171,19 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 	$gcid = "";
 
+	$alternate = poco_alternate_ostatus_url($profile_url);
+
 	if ($profile_url == "")
 		return $gcid;
 
+	$urlparts = parse_url($profile_url);
+	if (!isset($urlparts["scheme"]))
+		return $gcid;
+
+	if (in_array($urlparts["host"], array("www.facebook.com", "facebook.com", "twitter.com",
+						"identi.ca", "alpha.app.net")))
+		return $gcid;
+
 	$orig_updated = $updated;
 
 	// Don't store the statusnet connector as network
@@ -190,7 +207,7 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 		);
 		if(count($r)) {
 			$network = $r[0]["network"];
-			$profile_url = $r[0]["url"];
+			//$profile_url = $r[0]["url"];
 		}
 	}
 
@@ -205,24 +222,49 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 		if ($updated == "0000-00-00 00:00:00")
 			$updated = $x[0]["updated"];
 
-		$last_contact = $x[0]["last_contact"];
-		$last_failure = $x[0]["last_failure"];
+		$created = $x[0]["created"];
 		$server_url = $x[0]["server_url"];
+		$nick = $x[0]["nick"];
+		$addr = $x[0]["addr"];
 	} else {
-		$last_contact = "0000-00-00 00:00:00";
-		$last_failure = "0000-00-00 00:00:00";
+		$created = "0000-00-00 00:00:00";
 		$server_url = "";
+
+		$urlparts = parse_url($profile_url);
+		$nick = end(explode("/", $urlparts["path"]));
+		$addr = "";
 	}
 
-	if (($network == "") OR ($name == "") OR ($profile_photo == "") OR ($server_url == "")) {
+	if ((($network == "") OR ($name == "") OR ($addr == "") OR ($profile_photo == "") OR ($server_url == "") OR $alternate)
+		AND poco_reachable($profile_url, $server_url, $network, false)) {
 		$data = probe_url($profile_url);
+
+		$orig_profile = $profile_url;
+
 		$network = $data["network"];
 		$name = $data["name"];
+		$nick = $data["nick"];
+		$addr = $data["addr"];
 		$profile_url = $data["url"];
 		$profile_photo = $data["photo"];
 		$server_url = $data["baseurl"];
+
+		if ($alternate AND ($network == NETWORK_OSTATUS)) {
+			// Delete the old entry - if it exists
+			$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
+			if ($r) {
+				q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($orig_profile)));
+				q("DELETE FROM `glink` WHERE `gcid` = %d", intval($r[0]["id"]));
+			}
+
+			// possibly create a new entry
+			poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
+		}
 	}
 
+	if ($alternate AND ($network == NETWORK_OSTATUS))
+		return $gcid;
+
 	if (count($x) AND ($x[0]["network"] == "") AND ($network != "")) {
 		q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
 			dbesc($network),
@@ -240,17 +282,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 	poco_check_server($server_url, $network);
 
-	// Only fetch last update manually if it wasn't provided and enabled in the system
-	if (get_config('system','poco_completion') AND ($orig_updated == "0000-00-00 00:00:00") AND poco_do_update($updated, $last_contact, $last_failure)) {
-		$last_updated = poco_last_updated($profile_url);
-		if ($last_updated) {
-			$updated = $last_updated;
-			$last_contact = datetime_convert();
-			logger("Last updated for profile ".$profile_url.": ".$updated, LOGGER_DEBUG);
-		} else
-			$last_failure = datetime_convert();
-	}
-
 	if(count($x)) {
 		$gcid = $x[0]['id'];
 
@@ -266,14 +297,18 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 		if (($keywords == "") AND ($x[0]['keywords'] != ""))
 			$keywords = $x[0]['keywords'];
 
+		if (($addr == "") AND ($x[0]['addr'] != ""))
+			$addr = $x[0]['addr'];
+
 		if (($generation == 0) AND ($x[0]['generation'] > 0))
 			$generation = $x[0]['generation'];
 
 		if($x[0]['name'] != $name || $x[0]['photo'] != $profile_photo || $x[0]['updated'] < $updated) {
-			q("UPDATE `gcontact` SET `name` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s', `server_url` = '%s',
+			q("UPDATE `gcontact` SET `name` = '%s', `addr` = '%s', `network` = '%s', `photo` = '%s', `connect` = '%s', `url` = '%s', `server_url` = '%s',
 				`updated` = '%s', `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s', `generation` = %d
 				WHERE (`generation` >= %d OR `generation` = 0) AND `nurl` = '%s'",
 				dbesc($name),
+				dbesc($addr),
 				dbesc($network),
 				dbesc($profile_photo),
 				dbesc($connect_url),
@@ -290,18 +325,19 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 			);
 		}
 	} else {
-		q("INSERT INTO `gcontact` (`name`,`network`, `url`,`nurl`,`photo`,`connect`, `server_url`, `updated`, `last_contact`, `last_failure`, `location`, `about`, `keywords`, `gender`, `generation`)
-			VALUES ('%s', '%s', '%s', '%s', '%s','%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+		q("INSERT INTO `gcontact` (`name`, `nick`, `addr`, `network`, `url`, `nurl`, `photo`, `connect`, `server_url`, `created`, `updated`, `location`, `about`, `keywords`, `gender`, `generation`)
+			VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
 			dbesc($name),
+			dbesc($nick),
+			dbesc($addr),
 			dbesc($network),
 			dbesc($profile_url),
 			dbesc(normalise_link($profile_url)),
 			dbesc($profile_photo),
 			dbesc($connect_url),
 			dbesc($server_url),
+			dbesc(datetime_convert()),
 			dbesc($updated),
-			dbesc($last_contact),
-			dbesc($last_failure),
 			dbesc($location),
 			dbesc($about),
 			dbesc($keywords),
@@ -352,21 +388,197 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 	return $gcid;
 }
 
-function poco_last_updated($profile) {
+function poco_reachable($profile, $server = "", $network = "", $force = false) {
+
+	if ($server == "")
+		$server = poco_detect_server($profile);
+
+	if ($server == "")
+		return true;
+
+	return poco_check_server($server, $network, $force);
+}
+
+function poco_detect_server($profile) {
+
+	// Try to detect the server path based upon some known standard paths
+	$server_url = "";
+
+	if ($server_url == "") {
+		$friendica = preg_replace("=(https?://)(.*)/profile/(.*)=ism", "$1$2", $profile);
+		if ($friendica != $profile) {
+			$server_url = $friendica;
+			$network = NETWORK_DFRN;
+		}
+	}
+
+	if ($server_url == "") {
+		$diaspora = preg_replace("=(https?://)(.*)/u/(.*)=ism", "$1$2", $profile);
+		if ($diaspora != $profile) {
+			$server_url = $diaspora;
+			$network = NETWORK_DIASPORA;
+		}
+	}
+
+	if ($server_url == "") {
+		$red = preg_replace("=(https?://)(.*)/channel/(.*)=ism", "$1$2", $profile);
+		if ($red != $profile) {
+			$server_url = $red;
+			$network = NETWORK_DIASPORA;
+		}
+	}
+
+	return $server_url;
+}
+
+function poco_alternate_ostatus_url($url) {
+	return(preg_match("=https?://.+/user/\d+=ism", $url, $matches));
+}
+
+function poco_last_updated($profile, $force = false) {
 
 	$gcontacts = q("SELECT * FROM `gcontact` WHERE `nurl` = '%s'",
 			dbesc(normalise_link($profile)));
 
-	if ($gcontacts[0]["server_url"] != "") {
-		$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s' AND `last_contact` < `last_failure`", dbesc(normalise_link($gcontacts[0]["server_url"])));
+	if ($gcontacts[0]["created"] == "0000-00-00 00:00:00")
+		q("UPDATE `gcontact` SET `created` = '%s' WHERE `nurl` = '%s'",
+			dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+
+	if ($gcontacts[0]["server_url"] != "")
+		$server_url = $gcontacts[0]["server_url"];
+	else
+		$server_url = poco_detect_server($profile);
+
+	if ($server_url != "") {
+		if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
+
+			if ($force)
+				q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
+					dbesc(datetime_convert()), dbesc(normalise_link($profile)));
 
-		if ($servers)
 			return false;
+		}
+
+		q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
+			dbesc($server_url), dbesc(normalise_link($profile)));
+	}
+
+	if (in_array($gcontacts[0]["network"], array("", NETWORK_FEED))) {
+		$server = q("SELECT `network` FROM `gserver` WHERE `nurl` = '%s' AND `network` != ''",
+			dbesc(normalise_link($server_url)));
+
+		if ($server)
+			q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
+				dbesc($server[0]["network"]), dbesc(normalise_link($profile)));
+		else
+			return;
+	}
+
+	// noscrape is really fast so we don't cache the call.
+	if (($gcontacts[0]["server_url"] != "") AND ($gcontacts[0]["nick"] != "")) {
+
+		//  Use noscrape if possible
+		$server = q("SELECT `noscrape` FROM `gserver` WHERE `nurl` = '%s' AND `noscrape` != ''", dbesc(normalise_link($gcontacts[0]["server_url"])));
+
+		if ($server) {
+			$noscraperet = z_fetch_url($server[0]["noscrape"]."/".$gcontacts[0]["nick"]);
+
+			 if ($noscraperet["success"] AND ($noscraperet["body"] != "")) {
+
+				$noscrape = json_decode($noscraperet["body"], true);
+
+				if (($noscrape["fn"] != "") AND ($noscrape["fn"] != $gcontacts[0]["name"]))
+					q("UPDATE `gcontact` SET `name` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["fn"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["photo"] != "") AND ($noscrape["photo"] != $gcontacts[0]["photo"]))
+					q("UPDATE `gcontact` SET `photo` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["photo"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["updated"] != "") AND ($noscrape["updated"] != $gcontacts[0]["updated"]))
+					q("UPDATE `gcontact` SET `updated` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["updated"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["gender"] != "") AND ($noscrape["gender"] != $gcontacts[0]["gender"]))
+					q("UPDATE `gcontact` SET `gender` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["gender"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["pdesc"] != "") AND ($noscrape["pdesc"] != $gcontacts[0]["about"]))
+					q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["pdesc"]), dbesc(normalise_link($profile)));
+
+				if (($noscrape["about"] != "") AND ($noscrape["about"] != $gcontacts[0]["about"]))
+					q("UPDATE `gcontact` SET `about` = '%s' WHERE `nurl` = '%s'",
+						dbesc($noscrape["about"]), dbesc(normalise_link($profile)));
+
+				if (isset($noscrape["comm"]) AND ($noscrape["comm"] != $gcontacts[0]["community"]))
+					q("UPDATE `gcontact` SET `community` = %d WHERE `nurl` = '%s'",
+						intval($noscrape["comm"]), dbesc(normalise_link($profile)));
+
+				if (isset($noscrape["tags"]))
+					$keywords = implode(" ", $noscrape["tags"]);
+				else
+					$keywords = "";
+
+				if (($keywords != "") AND ($keywords != $gcontacts[0]["keywords"]))
+					q("UPDATE `gcontact` SET `keywords` = '%s' WHERE `nurl` = '%s'",
+						dbesc($keywords), dbesc(normalise_link($profile)));
+
+				$location = $noscrape["locality"];
+
+				if ($noscrape["region"] != "") {
+					if ($location != "")
+						$location .= ", ";
+
+					$location .= $noscrape["region"];
+				}
+
+				if ($noscrape["country-name"] != "") {
+					if ($location != "")
+						$location .= ", ";
+
+					$location .= $noscrape["country-name"];
+				}
+
+				if (($location != "") AND ($location != $gcontacts[0]["location"]))
+					q("UPDATE `gcontact` SET `location` = '%s' WHERE `nurl` = '%s'",
+						dbesc($location), dbesc(normalise_link($profile)));
+
+				// If we got data from noscrape then mark the contact as reachable
+				if (is_array($noscrape) AND count($noscrape))
+					q("UPDATE `gcontact` SET `last_contact` = '%s' WHERE `nurl` = '%s'",
+						dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+
+				return $noscrape["updated"];
+			}
+		}
 	}
 
+	// If we only can poll the feed, then we only do this once a while
+	if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"],  $gcontacts[0]["last_contact"]))
+		return $gcontacts[0]["updated"];
+
 	$data = probe_url($profile);
 
-	if (($data["poll"] == "") OR ($data["network"] == NETWORK_FEED)) {
+	// Is the profile link the alternate OStatus link notation? (http://domain.tld/user/4711)
+	// Then check the other link and delete this one
+	if (($data["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($profile) AND
+		(normalise_link($profile) == normalise_link($data["alias"])) AND
+		(normalise_link($profile) != normalise_link($data["url"]))) {
+
+		// Delete the old entry
+		q("DELETE FROM `gcontact` WHERE `nurl` = '%s'", dbesc(normalise_link($profile)));
+		q("DELETE FROM `glink` WHERE `gcid` = %d", intval($gcontacts[0]["id"]));
+
+		poco_check($data["url"], $data["name"], $data["network"], $data["photo"], $gcontacts[0]["about"], $gcontacts[0]["location"],
+				$gcontacts[0]["gender"], $gcontacts[0]["keywords"], $data["addr"], $gcontacts[0]["updated"], $gcontacts[0]["generation"]);
+
+		poco_last_updated($data["url"], $force);
+
+		return false;
+	}
+
+	if (($data["poll"] == "") OR (in_array($data["network"], array(NETWORK_FEED, NETWORK_PHANTOM)))) {
 		q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
 			dbesc(datetime_convert()), dbesc(normalise_link($profile)));
 		return false;
@@ -376,6 +588,10 @@ function poco_last_updated($profile) {
 		q("UPDATE `gcontact` SET `name` = '%s' WHERE `nurl` = '%s'",
 			dbesc($data["name"]), dbesc(normalise_link($profile)));
 
+	if (($data["nick"] != "") AND ($data["nick"] != $gcontacts[0]["nick"]))
+		q("UPDATE `gcontact` SET `nick` = '%s' WHERE `nurl` = '%s'",
+			dbesc($data["nick"]), dbesc(normalise_link($profile)));
+
 	if (($data["addr"] != "") AND ($data["addr"] != $gcontacts[0]["connect"]))
 		q("UPDATE `gcontact` SET `connect` = '%s' WHERE `nurl` = '%s'",
 			dbesc($data["addr"]), dbesc(normalise_link($profile)));
@@ -388,11 +604,6 @@ function poco_last_updated($profile) {
 		q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
 			dbesc($data["baseurl"]), dbesc(normalise_link($profile)));
 
-	if ($data["baseurl"] != "")
-		poco_check_server($data["baseurl"], $data["network"]);
-
-	// To-Do: Use noscrape
-
 	$feedret = z_fetch_url($data["poll"]);
 
 	if (!$feedret["success"]) {
@@ -430,10 +641,14 @@ function poco_last_updated($profile) {
 	q("UPDATE `gcontact` SET `updated` = '%s', `last_contact` = '%s' WHERE `nurl` = '%s'",
 		dbesc($last_updated), dbesc(datetime_convert()), dbesc(normalise_link($profile)));
 
+	if (($gcontacts[0]["generation"] == 0))
+		q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
+			dbesc(normalise_link($profile)));
+
 	return($last_updated);
 }
 
-function poco_do_update($updated, $last_contact, $last_failure) {
+function poco_do_update($created, $updated, $last_failure,  $last_contact) {
 	$now = strtotime(datetime_convert());
 
 	if ($updated > $last_contact)
@@ -442,6 +657,11 @@ function poco_do_update($updated, $last_contact, $last_failure) {
 		$contact_time = strtotime($last_contact);
 
 	$failure_time = strtotime($last_failure);
+	$created_time = strtotime($created);
+
+	// If there is no "created" time then use the current time
+	if ($created_time <= 0)
+		$created_time = $now;
 
 	// If the last contact was less than 24 hours then don't update
 	if (($now - $contact_time) < (60 * 60 * 24))
@@ -452,15 +672,15 @@ function poco_do_update($updated, $last_contact, $last_failure) {
 		return false;
 
 	// If the last contact was less than a week ago and the last failure is older than a week then don't update
-	if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time))
-		return false;
+	//if ((($now - $contact_time) < (60 * 60 * 24 * 7)) AND ($contact_time > $failure_time))
+	//	return false;
 
-	// If the last contact time was more than a week ago, then only try once a week
-	if ((($now - $contact_time) > (60 * 60 * 24 * 7)) AND (($now - $failure_time) < (60 * 60 * 24 * 7)))
+	// If the last contact time was more than a week ago and the contact was created more than a week ago, then only try once a week
+	if ((($now - $contact_time) > (60 * 60 * 24 * 7)) AND (($now - $created_time) > (60 * 60 * 24 * 7)) AND (($now - $failure_time) < (60 * 60 * 24 * 7)))
 		return false;
 
-	// If the last contact time was more than a month ago, then only try once a month - but only if there ever was a contact time
-	if (($contact_time > 0) AND (($now - $contact_time) > (60 * 60 * 24 * 30)) AND (($now - $failure_time) < (60 * 60 * 24 * 30)))
+	// If the last contact time was more than a month ago and the contact was created more than a month ago, then only try once a month
+	if ((($now - $contact_time) > (60 * 60 * 24 * 30)) AND (($now - $created_time) > (60 * 60 * 24 * 30)) AND (($now - $failure_time) < (60 * 60 * 24 * 30)))
 		return false;
 
 	return true;
@@ -475,13 +695,18 @@ function poco_to_boolean($val) {
 	return ($val);
 }
 
-function poco_check_server($server_url, $network = "") {
+function poco_check_server($server_url, $network = "", $force = false) {
 
 	if ($server_url == "")
 		return false;
 
 	$servers = q("SELECT * FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
 	if ($servers) {
+
+		if ($servers[0]["created"] == "0000-00-00 00:00:00")
+			q("UPDATE `gserver` SET `created` = '%s' WHERE `nurl` = '%s'",
+				dbesc(datetime_convert()), dbesc(normalise_link($server_url)));
+
 		$poco = $servers[0]["poco"];
 		$noscrape = $servers[0]["noscrape"];
 
@@ -496,8 +721,10 @@ function poco_check_server($server_url, $network = "") {
 		$info = $servers[0]["info"];
 		$register_policy = $servers[0]["register_policy"];
 
-		if (!poco_do_update("", $last_contact, $last_failure))
+		if (!$force AND !poco_do_update($servers[0]["created"], "", $last_failure, $last_contact)) {
+			logger("Use cached data for server ".$server_url, LOGGER_DEBUG);
 			return ($last_contact >= $last_failure);
+		}
 	} else {
 		$poco = "";
 		$noscrape = "";
@@ -510,6 +737,7 @@ function poco_check_server($server_url, $network = "") {
 		$last_contact = "0000-00-00 00:00:00";
 		$last_failure = "0000-00-00 00:00:00";
 	}
+	logger("Server ".$server_url." is outdated or unknown. Start discovery. Force: ".$force." Created: ".$servers[0]["created"]." Failure: ".$last_failure." Contact: ".$last_contact, LOGGER_DEBUG);
 
 	$failure = false;
 	$orig_last_failure = $last_failure;
@@ -528,11 +756,31 @@ function poco_check_server($server_url, $network = "") {
 	}
 
 	if (!$serverret["success"] OR ($serverret["body"] == "") OR (sizeof($xmlobj) == 0) OR !is_object($xmlobj)) {
-		$last_failure = datetime_convert();
-		$failure = true;
+		// Workaround for bad configured servers (known nginx problem)
+		if ($serverret["debug"]["http_code"] != "403") {
+			$last_failure = datetime_convert();
+			$failure = true;
+		}
 	} elseif ($network == NETWORK_DIASPORA)
 		$last_contact = datetime_convert();
 
+	if (!$failure) {
+		// Test for Diaspora
+		$serverret = z_fetch_url($server_url);
+
+		$lines = explode("\n",$serverret["header"]);
+		if(count($lines))
+			foreach($lines as $line) {
+				$line = trim($line);
+				if(stristr($line,'X-Diaspora-Version:')) {
+					$platform = "Diaspora";
+					$version = trim(str_replace("X-Diaspora-Version:", "", $line));
+					$version = trim(str_replace("x-diaspora-version:", "", $version));
+					$network = NETWORK_DIASPORA;
+				}
+			}
+	}
+
 	if (!$failure) {
 		// Test for Statusnet
 		// Will also return data for Friendica and GNU Social - but it will be overwritten later
@@ -559,6 +807,11 @@ function poco_check_server($server_url, $network = "") {
 			if (isset($data->site->server)) {
 				$last_contact = datetime_convert();
 
+				if (isset($data->site->hubzilla)) {
+					$platform = $data->site->hubzilla->PLATFORM_NAME;
+					$version = $data->site->hubzilla->RED_VERSION;
+					$network = NETWORK_DIASPORA;
+				}
 				if (isset($data->site->redmatrix)) {
 					if (isset($data->site->redmatrix->PLATFORM_NAME))
 						$platform = $data->site->redmatrix->PLATFORM_NAME;
@@ -603,6 +856,9 @@ function poco_check_server($server_url, $network = "") {
 			if (isset($data->network) AND ($platform == ""))
 				$platform = $data->network;
 
+			if ($platform == "Diaspora")
+				$network = NETWORK_DIASPORA;
+
 			if ($data->registrations_open)
 				$register_policy = REGISTER_OPEN;
 			else
@@ -618,6 +874,9 @@ function poco_check_server($server_url, $network = "") {
 	if (!$failure AND in_array($network, array(NETWORK_DFRN, NETWORK_OSTATUS))) {
 		$serverret = z_fetch_url($server_url."/friendica/json");
 
+		if (!$serverret["success"])
+			$serverret = z_fetch_url($server_url."/friendika/json");
+
 		if ($serverret["success"]) {
 			$data = json_decode($serverret["body"]);
 
@@ -659,6 +918,9 @@ function poco_check_server($server_url, $network = "") {
 		}
 	}
 
+	// Check again if the server exists
+	$servers = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
+
 	if ($servers)
 		 q("UPDATE `gserver` SET `url` = '%s', `version` = '%s', `site_name` = '%s', `info` = '%s', `register_policy` = %d, `poco` = '%s', `noscrape` = '%s',
 			`network` = '%s', `platform` = '%s', `last_contact` = '%s', `last_failure` = '%s' WHERE `nurl` = '%s'",
@@ -676,8 +938,8 @@ function poco_check_server($server_url, $network = "") {
 			dbesc(normalise_link($server_url))
 		);
 	else
-		q("INSERT INTO `gserver` (`url`, `nurl`, `version`, `site_name`, `info`, `register_policy`, `poco`, `noscrape`, `network`, `platform`, `last_contact`)
-					VALUES ('%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s')",
+		q("INSERT INTO `gserver` (`url`, `nurl`, `version`, `site_name`, `info`, `register_policy`, `poco`, `noscrape`, `network`, `platform`, `created`, `last_contact`, `last_failure`)
+					VALUES ('%s', '%s', '%s', '%s', '%s', %d, '%s', '%s', '%s', '%s', '%s', '%s', '%s')",
 				dbesc($server_url),
 				dbesc(normalise_link($server_url)),
 				dbesc($version),
@@ -688,9 +950,15 @@ function poco_check_server($server_url, $network = "") {
 				dbesc($noscrape),
 				dbesc($network),
 				dbesc($platform),
+				dbesc(datetime_convert()),
+				dbesc($last_contact),
+				dbesc($last_failure),
 				dbesc(datetime_convert())
 		);
-	return $failure;
+
+	logger("End discovery for server ".$server_url, LOGGER_DEBUG);
+
+	return !$failure;
 }
 
 function poco_contact_from_body($body, $created, $cid, $uid) {
@@ -779,15 +1047,16 @@ function count_common_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` INNER 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 blocked = 0 and hidden = 0 and id != %d ) ",
+		WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
+		((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+		AND `gcontact`.`nurl` IN (select nurl from contact where uid = %d and self = 0 and blocked = 0 and hidden = 0 and id != %d ) ",
 		intval($cid),
 		intval($uid),
 		intval($uid),
 		intval($cid)
 	);
 
-//	logger("count_common_friends: $uid $cid {$r[0]['total']}"); 
+//	logger("count_common_friends: $uid $cid {$r[0]['total']}");
 	if(count($r))
 		return $r[0]['total'];
 	return 0;
@@ -802,11 +1071,15 @@ function common_friends($uid,$cid,$start = 0,$limit=9999,$shuffle = false) {
 	else
 		$sql_extra = " order by `gcontact`.`name` asc ";
 
-	$r = q("SELECT `gcontact`.*
-		FROM `glink` INNER 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 blocked = 0 and hidden = 0 and id != %d ) 
-		$sql_extra limit %d, %d",
+	$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
+		FROM `glink`
+		INNER JOIN `gcontact` ON `glink`.`gcid` = `gcontact`.`id`
+		INNER JOIN `contact` ON `gcontact`.`nurl` = `contact`.`nurl`
+		WHERE `glink`.`cid` = %d and `glink`.`uid` = %d
+			AND `contact`.`uid` = %d AND `contact`.`self` = 0 AND `contact`.`blocked` = 0
+			AND `contact`.`hidden` = 0 AND `contact`.`id` != %d
+			AND ((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+			$sql_extra LIMIT %d, %d",
 		intval($cid),
 		intval($uid),
 		intval($uid),
@@ -863,7 +1136,8 @@ function count_all_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
 		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
-		where `glink`.`cid` = %d and `glink`.`uid` = %d ",
+		where `glink`.`cid` = %d and `glink`.`uid` = %d AND
+		((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))",
 		intval($cid),
 		intval($uid)
 	);
@@ -877,10 +1151,14 @@ function count_all_friends($uid,$cid) {
 
 function all_friends($uid,$cid,$start = 0, $limit = 80) {
 
-	$r = q("SELECT `gcontact`.*
-		FROM `glink` INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
-		where `glink`.`cid` = %d and `glink`.`uid` = %d
-		order by `gcontact`.`name` asc LIMIT %d, %d ",
+	$r = q("SELECT `gcontact`.*, `contact`.`id` AS `cid`
+		FROM `glink`
+		INNER JOIN `gcontact` on `glink`.`gcid` = `gcontact`.`id`
+		LEFT JOIN `contact` ON `contact`.`nurl` = `gcontact`.`nurl` AND `contact`.`uid` = %d
+		WHERE `glink`.`cid` = %d AND `glink`.`uid` = %d AND
+		((`gcontact`.`last_contact` >= `gcontact`.`last_failure`) OR (`gcontact`.`updated` >= `gcontact`.`last_failure`))
+		ORDER BY `gcontact`.`name` ASC LIMIT %d, %d ",
+		intval($uid),
 		intval($cid),
 		intval($uid),
 		intval($start),
@@ -967,8 +1245,8 @@ function update_suggestions() {
 
 	$done[] = $a->get_baseurl() . '/poco';
 
-	if(strlen(get_config('system','directory_submit_url'))) {
-		$x = fetch_url('http://dir.friendica.com/pubsites');
+	if(strlen(get_config('system','directory'))) {
+		$x = fetch_url(get_server()."/pubsites");
 		if($x) {
 			$j = json_decode($x);
 			if($j->entries) {
@@ -998,13 +1276,53 @@ function update_suggestions() {
 	}
 }
 
+function poco_discover_federation() {
+	$last = get_config('poco','last_federation_discovery');
+
+	if($last) {
+		$next = $last + (24 * 60 * 60);
+		if($next > time())
+			return;
+	}
+
+	$serverdata = fetch_url("http://the-federation.info/pods.json");
+
+	if (!$serverdata)
+		return;
+
+	$servers = json_decode($serverdata);
+
+	foreach($servers->pods AS $server)
+		poco_check_server("https://".$server->host);
+
+	set_config('poco','last_federation_discovery', time());
+
+}
+
 function poco_discover($complete = false) {
 
-	$last_update = date("c", time() - (60 * 60 * 24));
+	// Update the server list
+	poco_discover_federation();
+
+	$no_of_queries = 5;
+
+	$requery_days = intval(get_config("system", "poco_requery_days"));
+
+	if ($requery_days == 0)
+		$requery_days = 7;
+
+	$last_update = date("c", time() - (60 * 60 * 24 * $requery_days));
 
-	$r = q("SELECT `poco`, `nurl` FROM `gserver` WHERE `last_contact` > `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
+	$r = q("SELECT `poco`, `nurl`, `url`, `network` FROM `gserver` WHERE `last_contact` >= `last_failure` AND `poco` != '' AND `last_poco_query` < '%s' ORDER BY RAND()", dbesc($last_update));
 	if ($r)
 		foreach ($r AS $server) {
+
+			if (!poco_check_server($server["url"], $server["network"])) {
+				// The server is not reachable? Okay, then we will try it later
+				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
+				continue;
+			}
+
 			// Fetch all users from the other server
 			$url = $server["poco"]."/?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
 
@@ -1013,31 +1331,52 @@ function poco_discover($complete = false) {
 			$retdata = z_fetch_url($url);
 			if ($retdata["success"]) {
 				$data = json_decode($retdata["body"]);
+
 				poco_discover_server($data, 2);
 
 				if (get_config('system','poco_discovery') > 1) {
 
+					$timeframe = get_config('system','poco_discovery_since');
+					if ($timeframe == 0)
+						$timeframe = 30;
+
+					$updatedSince = date("Y-m-d H:i:s", time() - $timeframe * 86400);
+
 					// Fetch all global contacts from the other server (Not working with Redmatrix and Friendica versions before 3.3)
-					$url = $server["poco"]."/@global?fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+					$url = $server["poco"]."/@global?updatedSince=".$updatedSince."&fields=displayName,urls,photos,updated,network,aboutMe,currentLocation,tags,gender,generation";
+
+					$success = false;
 
 					$retdata = z_fetch_url($url);
 					if ($retdata["success"]) {
 						logger("Fetch all global contacts from the server ".$server["nurl"], LOGGER_DEBUG);
-						poco_discover_server(json_decode($retdata["body"]));
-					} elseif (get_config('system','poco_discovery') > 2) {
+						$success = poco_discover_server(json_decode($retdata["body"]));
+					}
+
+					if (!$success AND (get_config('system','poco_discovery') > 2)) {
 						logger("Fetch contacts from users of the server ".$server["nurl"], LOGGER_DEBUG);
-						poco_discover_server_users($data);
+						poco_discover_server_users($data, $server);
 					}
 				}
 
 				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
-				if (!$complete)
+				if (!$complete AND (--$no_of_queries == 0))
 					break;
+			} else {
+				// If the server hadn't replied correctly, then force a sanity check
+				poco_check_server($server["url"], $server["network"], true);
+
+				// If we couldn't reach the server, we will try it some time later
+				q("UPDATE `gserver` SET `last_poco_query` = '%s' WHERE `nurl` = '%s'", dbesc(datetime_convert()), dbesc($server["nurl"]));
 			}
 		}
 }
 
-function poco_discover_server_users($data) {
+function poco_discover_server_users($data, $server) {
+
+	if (!isset($data->entry))
+		return;
+
 	foreach ($data->entry AS $entry) {
 		$username = "";
 		if (isset($entry->urls)) {
@@ -1064,7 +1403,9 @@ function poco_discover_server_users($data) {
 function poco_discover_server($data, $default_generation = 0) {
 
 	if (!isset($data->entry) OR !count($data->entry))
-		return;
+		return false;
+
+	$success = false;
 
 	foreach ($data->entry AS $entry) {
 		$profile_url = '';
@@ -1093,6 +1434,7 @@ function poco_discover_server($data, $default_generation = 0) {
 				}
 			}
 		}
+
 		if(isset($entry->photos)) {
 			foreach($entry->photos as $photo) {
 				if($photo->type == 'profile') {
@@ -1125,10 +1467,13 @@ function poco_discover_server($data, $default_generation = 0) {
 				$keywords = implode(", ", $tag);
 
 		if ($generation > 0) {
+			$success = true;
+
 			logger("Store profile ".$profile_url, LOGGER_DEBUG);
-			poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation);
+			poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, 0, 0, 0);
 			logger("Done for profile ".$profile_url, LOGGER_DEBUG);
 		}
 	}
+	return $success;
 }
 ?>