X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=3718f82306fc7336e8d7db61747bacc540744b2c;hb=b4b2a6d5b82fdd758c5bcad4bc4a9ffd937b2bdb;hp=3b8e9140f8eb476b36d30f553eedb81679d03dba;hpb=a4804a25eebc7de456ce2edb4a5cea5194799ac5;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 3b8e9140f8..3718f82306 100644
--- a/include/socgraph.php
+++ b/include/socgraph.php
@@ -10,7 +10,8 @@
 require_once('include/datetime.php');
 require_once("include/Scrape.php");
 require_once("include/html2bbcode.php");
-
+require_once("include/Contact.php");
+require_once("include/Photo.php");
 
 /*
  * poco_load
@@ -173,8 +174,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 	$gcid = "";
 
-	$alternate = poco_alternate_ostatus_url($profile_url);
-
 	if ($profile_url == "")
 		return $gcid;
 
@@ -186,13 +185,19 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 						"identi.ca", "alpha.app.net")))
 		return $gcid;
 
-	$orig_updated = $updated;
-
 	// Don't store the statusnet connector as network
 	// We can't simply set this to NETWORK_OSTATUS since the connector could have fetched posts from friendica as well
 	if ($network == NETWORK_STATUSNET)
 		$network = "";
 
+	// Assure that there are no parameter fragments in the profile url
+	if (in_array($network, array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, "")))
+		$profile_url = clean_contact_url($profile_url);
+
+	$alternate = poco_alternate_ostatus_url($profile_url);
+
+	$orig_updated = $updated;
+
 	// The global contacts should contain the original picture, not the cached one
 	if (($generation != 1) AND stristr(normalise_link($profile_photo), normalise_link($a->get_baseurl()."/photo/")))
 		$profile_photo = "";
@@ -399,6 +404,11 @@ function poco_last_updated($profile, $force = false) {
 	else
 		$server_url = poco_detect_server($profile);
 
+	if (!in_array($gcontacts[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_FEED, NETWORK_OSTATUS, ""))) {
+		logger("Profile ".$profile.": Network type ".$gcontacts[0]["network"]." can't be checked", LOGGER_DEBUG);
+		return false;
+	}
+
 	if ($server_url != "") {
 		if (!poco_check_server($server_url, $gcontacts[0]["network"], $force)) {
 
@@ -406,6 +416,7 @@ function poco_last_updated($profile, $force = false) {
 				q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
 					dbesc(datetime_convert()), dbesc(normalise_link($profile)));
 
+			logger("Profile ".$profile.": Server ".$server_url." wasn't reachable.", LOGGER_DEBUG);
 			return false;
 		}
 
@@ -421,14 +432,14 @@ function poco_last_updated($profile, $force = false) {
 			q("UPDATE `gcontact` SET `network` = '%s' WHERE `nurl` = '%s'",
 				dbesc($server[0]["network"]), dbesc(normalise_link($profile)));
 		else
-			return;
+			return false;
 	}
 
 	// 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"])));
+		$server = q("SELECT `noscrape`, `network` 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"]);
@@ -437,76 +448,71 @@ function poco_last_updated($profile, $force = false) {
 
 				$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 (is_array($noscrape)) {
+					$contact = array("url" => $profile,
+							"network" => $server[0]["network"],
+							"generation" => $gcontacts[0]["generation"]);
 
-				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 (isset($noscrape["fn"]))
+						$contact["name"] = $noscrape["fn"];
 
-				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 (isset($noscrape["comm"]))
+						$contact["community"] = $noscrape["comm"];
 
-				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 (isset($noscrape["tags"])) {
+						$keywords = implode(" ", $noscrape["tags"]);
+						if ($keywords != "")
+							$contact["keywords"] = $keywords;
+					}
 
-				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)));
+					$location = formatted_location($noscrape);
+					if ($location)
+						$contact["location"] = $location;
 
-				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["dfrn-notify"]))
+						$contact["notify"] = $noscrape["dfrn-notify"];
 
-				if (isset($noscrape["tags"]))
-					$keywords = implode(" ", $noscrape["tags"]);
-				else
-					$keywords = "";
+					// Remove all fields that are not present in the gcontact table
+					unset($noscrape["fn"]);
+					unset($noscrape["key"]);
+					unset($noscrape["homepage"]);
+					unset($noscrape["comm"]);
+					unset($noscrape["tags"]);
+					unset($noscrape["locality"]);
+					unset($noscrape["region"]);
+					unset($noscrape["country-name"]);
+					unset($noscrape["contacts"]);
+					unset($noscrape["dfrn-request"]);
+					unset($noscrape["dfrn-confirm"]);
+					unset($noscrape["dfrn-notify"]);
+					unset($noscrape["dfrn-poll"]);
 
-				if (($keywords != "") AND ($keywords != $gcontacts[0]["keywords"]))
-					q("UPDATE `gcontact` SET `keywords` = '%s' WHERE `nurl` = '%s'",
-						dbesc($keywords), dbesc(normalise_link($profile)));
+					// Set the date of the last contact
+					/// @todo By now the function "update_gcontact" doesn't work with this field
+					//$contact["last_contact"] = datetime_convert();
 
-				$location = $noscrape["locality"];
+					$contact = array_merge($contact, $noscrape);
 
-				if ($noscrape["region"] != "") {
-					if ($location != "")
-						$location .= ", ";
+					update_gcontact($contact);
 
-					$location .= $noscrape["region"];
-				}
+					if (trim($noscrape["updated"]) != "") {
+						q("UPDATE `gcontact` SET `last_contact` = '%s' WHERE `nurl` = '%s'",
+							dbesc(datetime_convert()), dbesc(normalise_link($profile)));
 
-				if ($noscrape["country-name"] != "") {
-					if ($location != "")
-						$location .= ", ";
+						logger("Profile ".$profile." was last updated at ".$noscrape["updated"]." (noscrape)", LOGGER_DEBUG);
 
-					$location .= $noscrape["country-name"];
+						return $noscrape["updated"];
+					}
 				}
-
-				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"]))
+	if (!$force AND !poco_do_update($gcontacts[0]["created"], $gcontacts[0]["updated"], $gcontacts[0]["last_failure"],  $gcontacts[0]["last_contact"])) {
+		logger("Profile ".$profile." was last updated at ".$gcontacts[0]["updated"]." (cached)", LOGGER_DEBUG);
 		return $gcontacts[0]["updated"];
+	}
 
 	$data = probe_url($profile);
 
@@ -525,40 +531,42 @@ function poco_last_updated($profile, $force = false) {
 
 		poco_last_updated($data["url"], $force);
 
+		logger("Profile ".$profile." was deleted", LOGGER_DEBUG);
 		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)));
+
+		logger("Profile ".$profile." wasn't reachable (profile)", LOGGER_DEBUG);
 		return false;
 	}
 
-	if (($data["name"] != "") AND ($data["name"] != $gcontacts[0]["name"]))
-		q("UPDATE `gcontact` SET `name` = '%s' WHERE `nurl` = '%s'",
-			dbesc($data["name"]), dbesc(normalise_link($profile)));
+	$contact = array("generation" => $gcontacts[0]["generation"]);
 
-	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)));
+	$contact = array_merge($contact, $data);
 
-	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)));
+	$contact["server_url"] = $data["baseurl"];
 
-	if (($data["photo"] != "") AND ($data["photo"] != $gcontacts[0]["photo"]))
-		q("UPDATE `gcontact` SET `photo` = '%s' WHERE `nurl` = '%s'",
-			dbesc($data["photo"]), dbesc(normalise_link($profile)));
+	unset($contact["batch"]);
+	unset($contact["poll"]);
+	unset($contact["request"]);
+	unset($contact["confirm"]);
+	unset($contact["poco"]);
+	unset($contact["priority"]);
+	unset($contact["pubkey"]);
+	unset($contact["baseurl"]);
 
-	if (($data["baseurl"] != "") AND ($data["baseurl"] != $gcontacts[0]["server_url"]))
-		q("UPDATE `gcontact` SET `server_url` = '%s' WHERE `nurl` = '%s'",
-			dbesc($data["baseurl"]), dbesc(normalise_link($profile)));
+	update_gcontact($contact);
 
 	$feedret = z_fetch_url($data["poll"]);
 
 	if (!$feedret["success"]) {
 		q("UPDATE `gcontact` SET `last_failure` = '%s' WHERE `nurl` = '%s'",
 			dbesc(datetime_convert()), dbesc(normalise_link($profile)));
+
+		logger("Profile ".$profile." wasn't reachable (no feed)", LOGGER_DEBUG);
 		return false;
 	}
 
@@ -595,6 +603,8 @@ function poco_last_updated($profile, $force = false) {
 		q("UPDATE `gcontact` SET `generation` = 9 WHERE `nurl` = '%s'",
 			dbesc(normalise_link($profile)));
 
+	logger("Profile ".$profile." was last updated at ".$last_updated, LOGGER_DEBUG);
+
 	return($last_updated);
 }
 
@@ -746,7 +756,8 @@ function poco_check_server($server_url, $network = "", $force = false) {
 		// Will also return data for Friendica and GNU Social - but it will be overwritten later
 		// The "not implemented" is a special treatment for really, really old Friendica versions
 		$serverret = z_fetch_url($server_url."/api/statusnet/version.json");
-		if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND ($serverret["body"] != '') AND (strlen($serverret["body"]) < 250)) {
+		if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
+			($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
 			$platform = "StatusNet";
 			$version = trim($serverret["body"], '"');
 			$network = NETWORK_OSTATUS;
@@ -754,7 +765,8 @@ function poco_check_server($server_url, $network = "", $force = false) {
 
 		// Test for GNU Social
 		$serverret = z_fetch_url($server_url."/api/gnusocial/version.json");
-		if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND ($serverret["body"] != '') AND (strlen($serverret["body"]) < 250)) {
+		if ($serverret["success"] AND ($serverret["body"] != '{"error":"not implemented"}') AND
+			($serverret["body"] != '') AND (strlen($serverret["body"]) < 30)) {
 			$platform = "GNU Social";
 			$version = trim($serverret["body"], '"');
 			$network = NETWORK_OSTATUS;
@@ -881,6 +893,11 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	// Check again if the server exists
 	$servers = q("SELECT `nurl` FROM `gserver` WHERE `nurl` = '%s'", dbesc(normalise_link($server_url)));
 
+	$version = strip_tags($version);
+	$site_name = strip_tags($site_name);
+	$info = strip_tags($info);
+	$platform = strip_tags($platform);
+
 	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'",
@@ -921,88 +938,6 @@ function poco_check_server($server_url, $network = "", $force = false) {
 	return !$failure;
 }
 
-function poco_contact_from_body($body, $created, $cid, $uid) {
-	preg_replace_callback("/\[share(.*?)\].*?\[\/share\]/ism",
-		function ($match) use ($created, $cid, $uid){
-			return(sub_poco_from_share($match, $created, $cid, $uid));
-		}, $body);
-}
-
-function sub_poco_from_share($share, $created, $cid, $uid) {
-	$profile = "";
-	preg_match("/profile='(.*?)'/ism", $share[1], $matches);
-	if ($matches[1] != "")
-		$profile = $matches[1];
-
-	preg_match('/profile="(.*?)"/ism', $share[1], $matches);
-	if ($matches[1] != "")
-		$profile = $matches[1];
-
-	if ($profile == "")
-		return;
-
-	logger("prepare poco_check for profile ".$profile, LOGGER_DEBUG);
-	poco_check($profile, "", "", "", "", "", "", "", "", $created, 3, $cid, $uid);
-}
-
-function poco_store($item) {
-
-	// Isn't it public?
-	if ($item['private'])
-		return;
-
-	// Or is it from a network where we don't store the global contacts?
-	if (!in_array($item["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, NETWORK_STATUSNET, "")))
-		return;
-
-	// Is it a global copy?
-	$store_gcontact = ($item["uid"] == 0);
-
-	// Is it a comment on a global copy?
-	if (!$store_gcontact AND ($item["uri"] != $item["parent-uri"])) {
-		$q = q("SELECT `id` FROM `item` WHERE `uri`='%s' AND `uid` = 0", $item["parent-uri"]);
-		$store_gcontact = count($q);
-	}
-
-	if (!$store_gcontact)
-		return;
-
-	// "3" means: We don't know this contact directly (Maybe a reshared item)
-	$generation = 3;
-	$network = "";
-	$profile_url = $item["author-link"];
-
-	// Is it a user from our server?
-	$q = q("SELECT `id` FROM `contact` WHERE `self` AND `nurl` = '%s' LIMIT 1",
-		dbesc(normalise_link($item["author-link"])));
-	if (count($q)) {
-		logger("Our user (generation 1): ".$item["author-link"], LOGGER_DEBUG);
-		$generation = 1;
-		$network = NETWORK_DFRN;
-	} else { // Is it a contact from a user on our server?
-		$q = q("SELECT `network`, `url` FROM `contact` WHERE `uid` != 0 AND `network` != ''
-			AND (`nurl` = '%s' OR `alias` IN ('%s', '%s')) AND `network` != '%s' LIMIT 1",
-			dbesc(normalise_link($item["author-link"])),
-			dbesc(normalise_link($item["author-link"])),
-			dbesc($item["author-link"]),
-			dbesc(NETWORK_STATUSNET));
-		if (count($q)) {
-			$generation = 2;
-			$network = $q[0]["network"];
-			$profile_url = $q[0]["url"];
-			logger("Known contact (generation 2): ".$profile_url, LOGGER_DEBUG);
-		}
-	}
-
-	if ($generation == 3)
-		logger("Unknown contact (generation 3): ".$item["author-link"], LOGGER_DEBUG);
-
-	poco_check($profile_url, $item["author-name"], $network, $item["author-avatar"], "", "", "", "", "", $item["received"], $generation, $item["contact-id"], $item["uid"]);
-
-	// Maybe its a body with a shared item? Then extract a global contact from it.
-	poco_contact_from_body($item["body"], $item["received"], $item["contact-id"], $item["uid"]);
-}
-
 function count_common_friends($uid,$cid) {
 
 	$r = q("SELECT count(*) as `total`
@@ -1453,6 +1388,50 @@ function poco_discover_server($data, $default_generation = 0) {
 	return $success;
 }
 
+/**
+ * @brief Removes unwanted parts from a contact url
+ *
+ * @param string $url Contact url
+ * @return string Contact url with the wanted parts
+ */
+function clean_contact_url($url) {
+	$parts = parse_url($url);
+
+	if (!isset($parts["scheme"]) OR !isset($parts["host"]))
+		return $url;
+
+	$new_url = $parts["scheme"]."://".$parts["host"];
+
+	if (isset($parts["port"]))
+		$new_url .= ":".$parts["port"];
+
+	if (isset($parts["path"]))
+		$new_url .= $parts["path"];
+
+	if ($new_url != $url)
+		logger("Cleaned contact url ".$url." to ".$new_url." - Called by: ".App::callstack(), LOGGER_DEBUG);
+
+	return $new_url;
+}
+
+/**
+ * @brief Replace alternate OStatus user format with the primary one
+ *
+ * @param arr $contact contact array (called by reference)
+ */
+function fix_alternate_contact_address(&$contact) {
+	if (($contact["network"] == NETWORK_OSTATUS) AND poco_alternate_ostatus_url($contact["url"])) {
+		$data = probe_url($contact["url"]);
+		if ($contact["network"] == NETWORK_OSTATUS) {
+			logger("Fix primary url from ".$contact["url"]." to ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+			$contact["url"] = $data["url"];
+			$contact["addr"] = $data["addr"];
+			$contact["alias"] = $data["alias"];
+			$contact["server_url"] = $data["baseurl"];
+		}
+	}
+}
+
 /**
  * @brief Fetch the gcontact id, add an entry if not existed
  *
@@ -1462,18 +1441,44 @@ function poco_discover_server($data, $default_generation = 0) {
 function get_gcontact_id($contact) {
 
 	$gcontact_id = 0;
+	$doprobing = false;
+
+	if (in_array($contact["network"], array(NETWORK_PHANTOM))) {
+		logger("Invalid network for contact url ".$contact["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+		return false;
+	}
 
 	if ($contact["network"] == NETWORK_STATUSNET)
 		$contact["network"] = NETWORK_OSTATUS;
 
-	$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
+	// All new contacts are hidden by default
+	if (!isset($contact["hide"]))
+		$contact["hide"] = true;
+
+	// Replace alternate OStatus user format with the primary one
+	fix_alternate_contact_address($contact);
+
+	// Remove unwanted parts from the contact url (e.g. "?zrl=...")
+	if (in_array($contact["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS)))
+		$contact["url"] = clean_contact_url($contact["url"]);
+
+	$r = q("SELECT `id`, `last_contact`, `last_failure`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 		dbesc(normalise_link($contact["url"])));
 
-	if ($r)
+	if ($r) {
 		$gcontact_id = $r[0]["id"];
-	else {
-		q("INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `generation`)
-			VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d)",
+
+		// Update every 90 days
+		if (in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""))) {
+			$last_failure_str = $r[0]["last_failure"];
+			$last_failure = strtotime($r[0]["last_failure"]);
+			$last_contact_str = $r[0]["last_contact"];
+			$last_contact = strtotime($r[0]["last_contact"]);
+			$doprobing = (((time() - $last_contact) > (90 * 86400)) AND ((time() - $last_failure) > (90 * 86400)));
+		}
+	} else {
+		q("INSERT INTO `gcontact` (`name`, `nick`, `addr` , `network`, `url`, `nurl`, `photo`, `created`, `updated`, `location`, `about`, `hide`, `generation`)
+			VALUES ('%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', '%s', %d, %d)",
 			dbesc($contact["name"]),
 			dbesc($contact["nick"]),
 			dbesc($contact["addr"]),
@@ -1485,14 +1490,23 @@ function get_gcontact_id($contact) {
 			dbesc(datetime_convert()),
 			dbesc($contact["location"]),
 			dbesc($contact["about"]),
+			intval($contact["hide"]),
 			intval($contact["generation"])
 		);
 
-		$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
+		$r = q("SELECT `id`, `network` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 			dbesc(normalise_link($contact["url"])));
 
-		if ($r)
+		if ($r) {
 			$gcontact_id = $r[0]["id"];
+
+			$doprobing = in_array($r[0]["network"], array(NETWORK_DFRN, NETWORK_DIASPORA, NETWORK_OSTATUS, ""));
+		}
+	}
+
+	if ($doprobing) {
+		logger("Last Contact: ". $last_contact_str." - Last Failure: ".$last_failure_str." - Checking: ".$contact["url"], LOGGER_DEBUG);
+		proc_run('php', 'include/gprobe.php', bin2hex($contact["url"]));
 	}
 
 	if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
@@ -1530,30 +1544,77 @@ function update_gcontact($contact) {
 
 	unset($fields["url"]);
 	unset($fields["updated"]);
+	unset($fields["hide"]);
+
+	// Bugfix: We had an error in the storing of keywords which lead to the "0"
+	// This value is still transmitted via poco.
+	if ($contact["keywords"] == "0")
+		unset($contact["keywords"]);
+
+	if ($r[0]["keywords"] == "0")
+		$r[0]["keywords"] = "";
 
 	// assign all unassigned fields from the database entry
 	foreach ($fields AS $field => $data)
-		if (!isset($contact[$field]))
+		if (!isset($contact[$field]) OR ($contact[$field] == ""))
 			$contact[$field] = $r[0][$field];
 
+	if (!isset($contact["hide"]))
+		$contact["hide"] = $r[0]["hide"];
+
+	$fields["hide"] = $r[0]["hide"];
+
 	if ($contact["network"] == NETWORK_STATUSNET)
 		$contact["network"] = NETWORK_OSTATUS;
 
+	// Replace alternate OStatus user format with the primary one
+	fix_alternate_contact_address($contact);
+
 	if (!isset($contact["updated"]))
 		$contact["updated"] = datetime_convert();
 
+	if ($contact["server_url"] == "") {
+		$server_url = $contact["url"];
+
+		$server_url = matching_url($server_url, $contact["alias"]);
+		if ($server_url != "")
+			$contact["server_url"] = $server_url;
+
+		$server_url = matching_url($server_url, $contact["photo"]);
+		if ($server_url != "")
+			$contact["server_url"] = $server_url;
+
+		$server_url = matching_url($server_url, $contact["notify"]);
+		if ($server_url != "")
+			$contact["server_url"] = $server_url;
+	} else
+		$contact["server_url"] = normalise_link($contact["server_url"]);
+
+	if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) {
+		$hostname = str_replace("http://", "", $contact["server_url"]);
+		$contact["addr"] = $contact["nick"]."@".$hostname;
+	}
+
 	// Check if any field changed
 	$update = false;
 	unset($fields["generation"]);
 
-	foreach ($fields AS $field => $data)
-		if ($contact[$field] != $r[0][$field])
-			$update = true;
+	if ((($contact["generation"] > 0) AND ($contact["generation"] <= $r[0]["generation"])) OR ($r[0]["generation"] == 0)) {
+		foreach ($fields AS $field => $data)
+			if ($contact[$field] != $r[0][$field]) {
+				logger("Difference for contact ".$contact["url"]." in field '".$field."'. New value: '".$contact[$field]."', old value '".$r[0][$field]."'", LOGGER_DEBUG);
+				$update = true;
+			}
 
-	if ($contact["generation"] < $r[0]["generation"])
-		$update = true;
+		if ($contact["generation"] < $r[0]["generation"]) {
+			logger("Difference for contact ".$contact["url"]." in field 'generation'. new value: '".$contact["generation"]."', old value '".$r[0]["generation"]."'", LOGGER_DEBUG);
+			$update = true;
+		}
+	}
 
 	if ($update) {
+		logger("Update gcontact for ".$contact["url"]." Callstack: ".App::callstack(), LOGGER_DEBUG);
+
 		q("UPDATE `gcontact` SET `photo` = '%s', `name` = '%s', `nick` = '%s', `addr` = '%s', `network` = '%s',
 					`birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
 					`alias` = '%s', `notify` = '%s', `url` = '%s',
@@ -1568,6 +1629,28 @@ function update_gcontact($contact) {
 			intval($contact["generation"]), dbesc($contact["updated"]),
 			dbesc($contact["server_url"]), dbesc($contact["connect"]),
 			dbesc(normalise_link($contact["url"])), intval($contact["generation"]));
+
+
+		// Now update the contact entry with the user id "0" as well.
+		// This is used for the shadow copies of public items.
+		$r = q("SELECT `id` FROM `contact` WHERE `nurl` = '%s' AND `uid` = 0 ORDER BY `id` LIMIT 1",
+			dbesc(normalise_link($contact["url"])));
+
+		if ($r) {
+			logger("Update shadow contact ".$r[0]["id"], LOGGER_DEBUG);
+
+			update_contact_avatar($contact["photo"], 0, $r[0]["id"]);
+
+			q("UPDATE `contact` SET `name` = '%s', `nick` = '%s', `addr` = '%s',
+						`network` = '%s', `bd` = '%s', `gender` = '%s',
+						`keywords` = '%s', `alias` = '%s', `url` = '%s',
+						`location` = '%s', `about` = '%s'
+					WHERE `id` = %d",
+				dbesc($contact["name"]), dbesc($contact["nick"]), dbesc($contact["addr"]),
+				dbesc($contact["network"]), dbesc($contact["birthday"]), dbesc($contact["gender"]),
+				dbesc($contact["keywords"]), dbesc($contact["alias"]), dbesc($contact["url"]),
+				dbesc($contact["location"]), dbesc($contact["about"]), intval($r[0]["id"]));
+		}
 	}
 
 	return $gcontact_id;
@@ -1581,8 +1664,50 @@ function update_gcontact($contact) {
 function update_gcontact_from_probe($url) {
 	$data = probe_url($url);
 
-	if ($data["network"] != NETWORK_PHANTOM)
-		update_gcontact($data);
+	if (in_array($data["network"], array(NETWORK_PHANTOM))) {
+		logger("Invalid network for contact url ".$data["url"]." - Called by: ".App::callstack(), LOGGER_DEBUG);
+		return;
+	}
+
+	update_gcontact($data);
+}
+
+/**
+ * @brief Update the gcontact entry for a given user id
+ *
+ * @param int $uid User ID
+ */
+function update_gcontact_for_user($uid) {
+	$r = q("SELECT `profile`.`locality`, `profile`.`region`, `profile`.`country-name`,
+			`profile`.`name`, `profile`.`about`, `profile`.`gender`,
+			`profile`.`pub_keywords`, `profile`.`dob`, `profile`.`photo`,
+			`profile`.`net-publish`, `user`.`nickname`, `user`.`hidewall`,
+			`contact`.`notify`, `contact`.`url`, `contact`.`addr`
+		FROM `profile`
+			INNER JOIN `user` ON `user`.`uid` = `profile`.`uid`
+			INNER JOIN `contact` ON `contact`.`uid` = `profile`.`uid`
+		WHERE `profile`.`uid` = %d AND `profile`.`is-default` AND `contact`.`self`",
+		intval($uid));
+
+	$location = formatted_location(array("locality" => $r[0]["locality"], "region" => $r[0]["region"],
+						"country-name" => $r[0]["country-name"]));
+
+	// The "addr" field was added in 3.4.3 so it can be empty for older users
+	if ($r[0]["addr"] != "")
+		$addr = $r[0]["nickname"].'@'.str_replace(array("http://", "https://"), "", App::get_baseurl());
+	else
+		$addr = $r[0]["addr"];
+
+	$gcontact = array("name" => $r[0]["name"], "location" => $location, "about" => $r[0]["about"],
+			"gender" => $r[0]["gender"], "keywords" => $r[0]["pub_keywords"],
+			"birthday" => $r[0]["dob"], "photo" => $r[0]["photo"],
+			"notify" => $r[0]["notify"], "url" => $r[0]["url"],
+			"hide" => ($r[0]["hidewall"] OR !$r[0]["net-publish"]),
+			"nick" => $r[0]["nickname"], "addr" => $addr,
+			"connect" => $addr, "server_url" => App::get_baseurl(),
+			"generation" => 1, "network" => NETWORK_DFRN);
+
+	update_gcontact($gcontact);
 }
 
 /**