X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsocgraph.php;h=186326f42d961a11ca39c9e002f7b8b16ec07692;hb=9619829b4ab693bdbe2e24071e3d39d840d855b0;hp=4532abb39b2543678f26114dd852ce5b8bbcc575;hpb=0ed7a2376a517e8d17e2124fb22ab167f3c25472;p=friendica.git

diff --git a/include/socgraph.php b/include/socgraph.php
index 4532abb39b..186326f42d 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
@@ -139,15 +140,16 @@ function poco_load($cid,$uid = 0,$zcid = 0,$url = null) {
 		poco_check($profile_url, $name, $network, $profile_photo, $about, $location, $gender, $keywords, $connect_url, $updated, $generation, $cid, $uid, $zcid);
 
 		// Update the Friendica contacts. Diaspora is doing it via a message. (See include/diaspora.php)
-		if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
-			q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
-				WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
-				dbesc($location),
-				dbesc($about),
-				dbesc($keywords),
-				dbesc($gender),
-				dbesc(normalise_link($profile_url)),
-				dbesc(NETWORK_DFRN));
+		// Deactivated because we now update Friendica contacts in dfrn.php
+		//if (($location != "") OR ($about != "") OR ($keywords != "") OR ($gender != ""))
+		//	q("UPDATE `contact` SET `location` = '%s', `about` = '%s', `keywords` = '%s', `gender` = '%s'
+		//		WHERE `nurl` = '%s' AND NOT `self` AND `network` = '%s'",
+		//		dbesc($location),
+		//		dbesc($about),
+		//		dbesc($keywords),
+		//		dbesc($gender),
+		//		dbesc(normalise_link($profile_url)),
+		//		dbesc(NETWORK_DFRN));
 	}
 	logger("poco_load: loaded $total entries",LOGGER_DEBUG);
 
@@ -289,93 +291,25 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 
 	poco_check_server($server_url, $network);
 
-	if(count($x)) {
-		$gcid = $x[0]['id'];
-
-		if (($location == "") AND ($x[0]['location'] != ""))
-			$location = $x[0]['location'];
-
-		if (($about == "") AND ($x[0]['about'] != ""))
-			$about = $x[0]['about'];
-
-		if (($gender == "") AND ($x[0]['gender'] != ""))
-			$gender = $x[0]['gender'];
-
-		if (($keywords == "") AND ($x[0]['keywords'] != ""))
-			$keywords = $x[0]['keywords'];
-
-		if (($addr == "") AND ($x[0]['addr'] != ""))
-			$addr = $x[0]['addr'];
-
-		if (($alias == "") AND ($x[0]['alias'] != ""))
-			$alias = $x[0]['alias'];
-
-		if (($notify == "") AND ($x[0]['notify'] != ""))
-			$notify = $x[0]['notify'];
-
-		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', `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,
-				`alias` = '$s', `notify` = '%s'
-				WHERE (`generation` >= %d OR `generation` = 0) AND `nurl` = '%s'",
-				dbesc($name),
-				dbesc($addr),
-				dbesc($network),
-				dbesc($profile_photo),
-				dbesc($connect_url),
-				dbesc($profile_url),
-				dbesc($server_url),
-				dbesc($updated),
-				dbesc($location),
-				dbesc($about),
-				dbesc($keywords),
-				dbesc($gender),
-				dbesc($alias),
-				dbesc($notify),
-				intval($generation),
-				intval($generation),
-				dbesc(normalise_link($profile_url))
-			);
-		}
-	} else {
-		// Maybe another process had inserted the entry after the first check, so it again
-		$x = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-			dbesc(normalise_link($profile_url))
-		);
-		if(!$x) {
-			q("INSERT INTO `gcontact` (`name`, `nick`, `addr`, `network`, `url`, `nurl`, `photo`, `connect`, `server_url`, `created`, `updated`, `location`, `about`, `keywords`, `gender`, `alias`, `notify`, `generation`)
-				VALUES ('%s', '%s', '%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($location),
-				dbesc($about),
-				dbesc($keywords),
-				dbesc($gender),
-				dbesc($alias),
-				dbesc($notify),
-				intval($generation)
-			);
-			$x = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
-				dbesc(normalise_link($profile_url))
-			);
-		}
-		if(count($x))
-			$gcid = $x[0]['id'];
-	}
-
-	if(! $gcid)
+	$gcontact = array("url" => $profile_url,
+			"addr" => $addr,
+			"alias" => $alias,
+			"name" => $name,
+			"network" => $network,
+			"photo" => $profile_photo,
+			"about" => $about,
+			"location" => $location,
+			"gender" => $gender,
+			"keywords" => $keywords,
+			"server_url" => $server_url,
+			"connect" => $connect_url,
+			"notify" => $notify,
+			"updated" => $updated,
+			"generation" => $generation);
+
+	$gcid = update_gcontact($gcontact);
+
+	if(!$gcid)
 		return $gcid;
 
 	$r = q("SELECT * FROM `glink` WHERE `cid` = %d AND `uid` = %d AND `gcid` = %d AND `zcid` = %d LIMIT 1",
@@ -402,13 +336,6 @@ function poco_check($profile_url, $name, $network, $profile_photo, $about, $loca
 		);
 	}
 
-	// For unknown reasons there are sometimes duplicates
-	//q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d AND
-	//	NOT EXISTS (SELECT `gcid` FROM `glink` WHERE `gcid` = `gcontact`.`id`)",
-	//	dbesc(normalise_link($profile_url)),
-	//	intval($gcid)
-	//);
-
 	return $gcid;
 }
 
@@ -502,7 +429,7 @@ function poco_last_updated($profile, $force = false) {
 	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"]);
@@ -511,69 +438,47 @@ 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 (($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 (is_array($noscrape)) {
+					$contact = array("url" => $profile,
+							"network" => $server[0]["network"],
+							"generation" => $gcontacts[0]["generation"]);
 
-				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)));
+					$contact["name"] = $noscrape["fn"];
+					$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 (($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 (isset($noscrape["tags"])) {
+						$keywords = implode(" ", $noscrape["tags"]);
+						if ($keywords != "")
+							$contact["keywords"] = $keywords;
+					}
 
-				if (($keywords != "") AND ($keywords != $gcontacts[0]["keywords"]))
-					q("UPDATE `gcontact` SET `keywords` = '%s' WHERE `nurl` = '%s'",
-						dbesc($keywords), dbesc(normalise_link($profile)));
+					$location = formatted_location($noscrape);
+					if ($location)
+						$contact["location"] = $location;
 
-				$location = $noscrape["locality"];
+					$contact["notify"] = $noscrape["dfrn-notify"];
 
-				if ($noscrape["region"] != "") {
-					if ($location != "")
-						$location .= ", ";
+					// 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"]);
 
-					$location .= $noscrape["region"];
-				}
+					$contact = array_merge($contact, $noscrape);
 
-				if ($noscrape["country-name"] != "") {
-					if ($location != "")
-						$location .= ", ";
+					update_gcontact($contact);
 
-					$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"];
 			}
 		}
 	}
@@ -608,25 +513,22 @@ function poco_last_updated($profile, $force = false) {
 		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"]);
 
@@ -995,88 +897,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`
@@ -1540,7 +1360,7 @@ function get_gcontact_id($contact) {
 	if ($contact["network"] == NETWORK_STATUSNET)
 		$contact["network"] = NETWORK_OSTATUS;
 
-	$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+	$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 		dbesc(normalise_link($contact["url"])));
 
 	if ($r)
@@ -1562,13 +1382,18 @@ function get_gcontact_id($contact) {
 			intval($contact["generation"])
 		);
 
-		$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' LIMIT 1",
+		$r = q("SELECT `id` FROM `gcontact` WHERE `nurl` = '%s' ORDER BY `id` LIMIT 2",
 			dbesc(normalise_link($contact["url"])));
 
 		if ($r)
 			$gcontact_id = $r[0]["id"];
 	}
 
+	if ((count($r) > 1) AND ($gcontact_id > 0) AND ($contact["url"] != ""))
+	 q("DELETE FROM `gcontact` WHERE `nurl` = '%s' AND `id` != %d",
+		dbesc(normalise_link($contact["url"])),
+		intval($gcontact_id));
+
 	return $gcontact_id;
 }
 
@@ -1587,79 +1412,116 @@ function update_gcontact($contact) {
 	if (!$gcontact_id)
 		return false;
 
-	$r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`, `hide`, `nsfw`, `network`, `alias`, `notify`, `url`
+	$r = q("SELECT `name`, `nick`, `photo`, `location`, `about`, `addr`, `generation`, `birthday`, `gender`, `keywords`,
+			`hide`, `nsfw`, `network`, `alias`, `notify`, `server_url`, `connect`, `updated`, `url`
 		FROM `gcontact` WHERE `id` = %d LIMIT 1",
 		intval($gcontact_id));
 
-	if ($contact["generation"] == 0)
-		$contact["generation"] = $r[0]["generation"];
-
-	if ($contact["photo"] == "")
-		$contact["photo"] = $r[0]["photo"];
+	// Get all field names
+	$fields = array();
+	foreach ($r[0] AS $field => $data)
+		$fields[$field] = $data;
 
-	if ($contact["name"] == "")
-		$contact["name"] = $r[0]["name"];
+	unset($fields["url"]);
+	unset($fields["updated"]);
 
-	if ($contact["nick"] == "")
-		$contact["nick"] = $r[0]["nick"];
+	// 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 ($contact["addr"] == "")
-		$contact["addr"] = $r[0]["addr"];
+	if ($r[0]["keywords"] == "0")
+		$r[0]["keywords"] = "";
 
-	if ($contact["location"] =="")
-		$contact["location"] = $r[0]["location"];
+	// assign all unassigned fields from the database entry
+	foreach ($fields AS $field => $data)
+		if (!isset($contact[$field]) OR ($contact[$field] == ""))
+			$contact[$field] = $r[0][$field];
 
-	if ($contact["about"] =="")
-		$contact["about"] = $r[0]["about"];
-
-	if ($contact["birthday"] =="")
-		$contact["birthday"] = $r[0]["birthday"];
+	if ($contact["network"] == NETWORK_STATUSNET)
+		$contact["network"] = NETWORK_OSTATUS;
 
-	if ($contact["gender"] =="")
-		$contact["gender"] = $r[0]["gender"];
+	if (!isset($contact["updated"]))
+		$contact["updated"] = datetime_convert();
 
-	if ($contact["keywords"] =="")
-		$contact["keywords"] = $r[0]["keywords"];
+	if ($contact["server_url"] == "") {
+		$server_url = $contact["url"];
 
-	if (!isset($contact["hide"]))
-		$contact["hide"] = $r[0]["hide"];
+		$server_url = matching_url($server_url, $contact["alias"]);
+		if ($server_url != "")
+			$contact["server_url"] = $server_url;
 
-	if (!isset($contact["nsfw"]))
-		$contact["nsfw"] = $r[0]["nsfw"];
+		$server_url = matching_url($server_url, $contact["photo"]);
+		if ($server_url != "")
+			$contact["server_url"] = $server_url;
 
-	if ($contact["network"] =="")
-		$contact["network"] = $r[0]["network"];
+		$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["alias"] =="")
-		$contact["alias"] = $r[0]["alias"];
+	if (($contact["addr"] == "") AND ($contact["server_url"] != "") AND ($contact["nick"] != "")) {
+		$hostname = str_replace("http://", "", $contact["server_url"]);
+		$contact["addr"] = $contact["nick"]."@".$hostname;
+	}
 
-	if ($contact["url"] =="")
-		$contact["url"] = $r[0]["url"];
+	// Check if any field changed
+	$update = false;
+	unset($fields["generation"]);
 
-	if ($contact["notify"] =="")
-		$contact["notify"] = $r[0]["notify"];
+	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["network"] == NETWORK_STATUSNET)
-		$contact["network"] = NETWORK_OSTATUS;
+		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 (($contact["photo"] != $r[0]["photo"]) OR ($contact["name"] != $r[0]["name"]) OR ($contact["nick"] != $r[0]["nick"]) OR ($contact["addr"] != $r[0]["addr"]) OR
-		($contact["birthday"] != $r[0]["birthday"]) OR ($contact["gender"] != $r[0]["gender"]) OR ($contact["keywords"] != $r[0]["keywords"]) OR
-		($contact["hide"] != $r[0]["hide"]) OR ($contact["nsfw"] != $r[0]["nsfw"]) OR ($contact["network"] != $r[0]["network"]) OR
-		($contact["alias"] != $r[0]["alias"]) OR ($contact["notify"] != $r[0]["notify"]) OR ($contact["url"] != $r[0]["url"]) OR
-		($contact["location"] != $r[0]["location"]) OR ($contact["about"] != $r[0]["about"]) OR ($contact["generation"] < $r[0]["generation"])) {
+	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` = %d, `hide` = %d, `nsfw` = %d,
+					`birthday` = '%s', `gender` = '%s', `keywords` = '%s', `hide` = %d, `nsfw` = %d,
 					`alias` = '%s', `notify` = '%s', `url` = '%s',
-					`location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s'
+					`location` = '%s', `about` = '%s', `generation` = %d, `updated` = '%s',
+					`server_url` = '%s', `connect` = '%s'
 				WHERE `nurl` = '%s' AND (`generation` = 0 OR `generation` >= %d)",
 			dbesc($contact["photo"]), dbesc($contact["name"]), dbesc($contact["nick"]),
 			dbesc($contact["addr"]), dbesc($contact["network"]), dbesc($contact["birthday"]),
 			dbesc($contact["gender"]), dbesc($contact["keywords"]), intval($contact["hide"]),
 			intval($contact["nsfw"]), dbesc($contact["alias"]), dbesc($contact["notify"]),
 			dbesc($contact["url"]), dbesc($contact["location"]), dbesc($contact["about"]),
-			intval($contact["generation"]), dbesc(datetime_convert()),
+			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;
@@ -1673,8 +1535,10 @@ function update_gcontact($contact) {
 function update_gcontact_from_probe($url) {
 	$data = probe_url($url);
 
-	if ($data["network"] != NETWORK_PHANTOM)
-		update_gcontact($data);
+	if ($data["network"] == NETWORK_PHANTOM)
+		return;
+
+	update_gcontact($data);
 }
 
 /**