X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=c01e3edd415ee0685603d9e5bfdecb1d322892c0;hb=0a519f500104712f9a07dd007ca078586aef76d1;hp=320bb43cc1c76fa4f3db62aa9c4cac67b913a76d;hpb=5ba6c7717a06842c27fec15508ff8cabb3d9a31b;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 320bb43cc1..c01e3edd41 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -9,21 +9,22 @@ namespace Friendica\Network;
  * @brief Functions for probing URL
  */
 
-use Friendica\App;
-use Friendica\Core\System;
+use DOMDocument;
 use Friendica\Core\Cache;
 use Friendica\Core\Config;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
 use Friendica\Database\DBM;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
+use Friendica\Protocol\Feed;
+use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
-
-use dba;
 use DomXPath;
-use DOMDocument;
 
-require_once 'include/feed.php';
-require_once 'include/network.php';
+require_once 'include/dba.php';
 
 /**
  * @brief This class contain functions for probing URL
@@ -42,12 +43,12 @@ class Probe
 	 */
 	private static function rearrangeData($data)
 	{
-		$fields = array("name", "nick", "guid", "url", "addr", "alias",
+		$fields = ["name", "nick", "guid", "url", "addr", "alias",
 				"photo", "community", "keywords", "location", "about",
 				"batch", "notify", "poll", "request", "confirm", "poco",
-				"priority", "network", "pubkey", "baseurl");
+				"priority", "network", "pubkey", "baseurl"];
 
-		$newdata = array();
+		$newdata = [];
 		foreach ($fields as $field) {
 			if (isset($data[$field])) {
 				$newdata[$field] = $data[$field];
@@ -88,6 +89,9 @@ class Probe
 	/**
 	 * @brief Probes for webfinger path via "host-meta"
 	 *
+	 * We have to check if the servers in the future still will offer this.
+	 * It seems as if it was dropped from the standard.
+	 *
 	 * @param string $host The host part of an url
 	 *
 	 * @return array with template and type of the webfinger template for JSON or XML
@@ -104,36 +108,37 @@ class Probe
 		$redirects = 0;
 
 		logger("Probing for ".$host, LOGGER_DEBUG);
+		$xrd = null;
 
-		$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+		$ret = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 		if ($ret['success']) {
 			$xml = $ret['body'];
-			$xrd = parse_xml_string($xml, false);
+			$xrd = XML::parseString($xml, false);
 			$host_url = 'https://'.$host;
 		}
 
 		if (!is_object($xrd)) {
-			$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
-			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 				logger("Probing timeout for ".$url, LOGGER_DEBUG);
 				return false;
 			}
 			$xml = $ret['body'];
-			$xrd = parse_xml_string($xml, false);
+			$xrd = XML::parseString($xml, false);
 			$host_url = 'http://'.$host;
 		}
 		if (!is_object($xrd)) {
 			logger("No xrd object found for ".$host, LOGGER_DEBUG);
-			return array();
+			return [];
 		}
 
 		$links = XML::elementToArray($xrd);
 		if (!isset($links["xrd"]["link"])) {
 			logger("No xrd data found for ".$host, LOGGER_DEBUG);
-			return array();
+			return [];
 		}
 
-		$lrdd = array();
+		$lrdd = [];
 		// The following webfinger path is defined in RFC 7033 https://tools.ietf.org/html/rfc7033
 		// Problem is that Hubzilla currently doesn't provide all data in the JSON webfinger
 		// compared to the XML webfinger. So this is commented out by now.
@@ -207,7 +212,7 @@ class Probe
 	/**
 	 * @brief Check an URI for LRDD data
 	 *
-	 * this is a replacement for the "lrdd" function in include/network.php.
+	 * this is a replacement for the "lrdd" function.
 	 * It isn't used in this class and has some redundancies in the code.
 	 * When time comes we can check the existing calls for "lrdd" if we can rework them.
 	 *
@@ -221,13 +226,13 @@ class Probe
 		$webfinger = null;
 
 		if (is_bool($lrdd)) {
-			return array();
+			return [];
 		}
 
 		if (!$lrdd) {
 			$parts = @parse_url($uri);
 			if (!$parts) {
-				return array();
+				return [];
 			}
 
 			$host = $parts["host"];
@@ -247,7 +252,7 @@ class Probe
 
 		if (!$lrdd) {
 			logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
-			return array();
+			return [];
 		}
 
 		foreach ($lrdd as $type => $template) {
@@ -282,17 +287,17 @@ class Probe
 			return false;
 		}
 
-		$data = array();
+		$data = [];
 
 		foreach ($webfinger["links"] as $link) {
-			$data[] = array("@attributes" => $link);
+			$data[] = ["@attributes" => $link];
 		}
 
 		if (is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
-				$data[] = array("@attributes" =>
-							array("rel" => "alias",
-								"href" => $alias));
+				$data[] = ["@attributes" =>
+							["rel" => "alias",
+								"href" => $alias]];
 			}
 		}
 
@@ -328,8 +333,8 @@ class Probe
 			$data["url"] = $uri;
 		}
 
-		if ($data["photo"] != "") {
-			$data["baseurl"] = matching_url(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+		if (x($data, "photo")) {
+			$data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"]));
 		} else {
 			$data["photo"] = System::baseUrl().'/images/person-175.jpg';
 		}
@@ -339,7 +344,7 @@ class Probe
 				$data["name"] = $data["nick"];
 			}
 
-			if ($data["name"] == "") {
+			if (!x($data, "name")) {
 				$data["name"] = $data["url"];
 			}
 		}
@@ -352,18 +357,18 @@ class Probe
 			}
 		}
 
-		if (self::$baseurl != "") {
+		if (!empty(self::$baseurl)) {
 			$data["baseurl"] = self::$baseurl;
 		}
 
-		if (!isset($data["network"])) {
+		if (empty($data["network"])) {
 			$data["network"] = NETWORK_PHANTOM;
 		}
 
 		$data = self::rearrangeData($data);
 
 		// Only store into the cache if the value seems to be valid
-		if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
+		if (!in_array($data['network'], [NETWORK_PHANTOM, NETWORK_MAIL])) {
 			Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY);
 
 			/// @todo temporary fix - we need a real contact update function that updates only changing fields
@@ -378,7 +383,7 @@ class Probe
 				&& $data["addr"]
 				&& $data["poll"]
 			) {
-				$fields = array('name' => $data['name'],
+				$fields = ['name' => $data['name'],
 						'nick' => $data['nick'],
 						'url' => $data['url'],
 						'addr' => $data['addr'],
@@ -388,9 +393,15 @@ class Probe
 						'about' => $data['about'],
 						'notify' => $data['notify'],
 						'network' => $data['network'],
-						'server_url' => $data['baseurl']);
+						'server_url' => $data['baseurl']];
+
+				// This doesn't cover the case when a community isn't a community anymore
+				if (!empty($data['community']) && $data['community']) {
+					$fields['community'] = $data['community'];
+					$fields['contact-type'] = ACCOUNT_TYPE_COMMUNITY;
+				}
 
-				$fieldnames = array();
+				$fieldnames = [];
 
 				foreach ($fields as $key => $val) {
 					if (empty($val)) {
@@ -402,13 +413,24 @@ class Probe
 
 				$fields['updated'] = DBM::date();
 
-				$condition = array('nurl' => normalise_link($data["url"]));
+				$condition = ['nurl' => normalise_link($data["url"])];
+
+				$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
 
-				$old_fields = dba::select('gcontact', $fieldnames, $condition, array('limit' => 1));
+				// When the gcontact doesn't exist, the value "true" will trigger an insert.
+				// In difference to the public contacts we want to have every contact
+				// in the world in our global contacts.
+				if (!$old_fields) {
+					$old_fields = true;
+
+					// These values have to be set only on insert
+					$fields['photo'] = $data['photo'];
+					$fields['created'] = DateTimeFormat::utcNow();
+				}
 
-				dba::update('gcontact', $fields, $condition, $old_fields);
+				DBA::update('gcontact', $fields, $condition, $old_fields);
 
-				$fields = array('name' => $data['name'],
+				$fields = ['name' => $data['name'],
 						'nick' => $data['nick'],
 						'url' => $data['url'],
 						'addr' => $data['addr'],
@@ -423,9 +445,12 @@ class Probe
 						'confirm' => $data['confirm'],
 						'poco' => $data['poco'],
 						'network' => $data['network'],
-						'success_update' => DBM::date());
+						'pubkey' => $data['pubkey'],
+						'priority' => $data['priority'],
+						'writable' => true,
+						'rel' => CONTACT_IS_SHARING];
 
-				$fieldnames = array();
+				$fieldnames = [];
 
 				foreach ($fields as $key => $val) {
 					if (empty($val)) {
@@ -435,11 +460,19 @@ class Probe
 					}
 				}
 
-				$condition = array('nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0);
+				$condition = ['nurl' => normalise_link($data["url"]), 'self' => false, 'uid' => 0];
 
-				$old_fields = dba::select('contact', $fieldnames, $condition, array('limit' => 1));
+				// "$old_fields" will return a "false" when the contact doesn't exist.
+				// This won't trigger an insert. This is intended, since we only need
+				// public contacts for everyone we store items from.
+				// We don't need to store every contact on the planet.
+				$old_fields = DBA::selectFirst('contact', $fieldnames, $condition);
 
-				dba::update('contact', $fields, $condition, $old_fields);
+				$fields['name-date'] = DateTimeFormat::utcNow();
+				$fields['uri-date'] = DateTimeFormat::utcNow();
+				$fields['success_update'] = DateTimeFormat::utcNow();
+
+				DBA::update('contact', $fields, $condition, $old_fields);
 			}
 		}
 
@@ -535,12 +568,12 @@ class Probe
 			}
 
 			if ($host == 'twitter.com') {
-				return array("network" => NETWORK_TWITTER);
+				return ["network" => NETWORK_TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
 			if (is_bool($lrdd)) {
-				return array();
+				return [];
 			}
 
 			$path_parts = explode("/", trim($parts["path"], "/"));
@@ -576,12 +609,12 @@ class Probe
 			$nick = substr($uri, 0, strpos($uri, '@'));
 
 			if (strpos($uri, '@twitter.com')) {
-				return array("network" => NETWORK_TWITTER);
+				return ["network" => NETWORK_TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
 			if (is_bool($lrdd)) {
-				return array();
+				return [];
 			}
 
 			if (!$lrdd) {
@@ -637,7 +670,7 @@ class Probe
 
 		logger("Probing ".$uri, LOGGER_DEBUG);
 
-		if (in_array($network, array("", NETWORK_DFRN))) {
+		if (in_array($network, ["", NETWORK_DFRN])) {
 			$result = self::dfrn($webfinger);
 		}
 		if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
@@ -647,7 +680,7 @@ class Probe
 			$result = self::ostatus($webfinger);
 		}
 		if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
-			$result = self::pumpio($webfinger);
+			$result = self::pumpio($webfinger, $addr);
 		}
 		if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
 			$result = self::feed($uri);
@@ -663,6 +696,14 @@ class Probe
 			}
 		}
 
+		if (empty($result["network"])) {
+			$result["network"] = NETWORK_PHANTOM;
+		}
+
+		if (empty($result["url"])) {
+			$result["url"] = $uri;
+		}
+
 		logger($uri." is ".$result["network"], LOGGER_DEBUG);
 
 		if (empty($result["baseurl"])) {
@@ -671,7 +712,6 @@ class Probe
 				$result["baseurl"] = substr($result["url"], 0, $pos).$host;
 			}
 		}
-
 		return $result;
 	}
 
@@ -690,8 +730,8 @@ class Probe
 		$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
 		$redirects = 0;
 
-		$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => $type));
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$data = $ret['body'];
@@ -706,7 +746,7 @@ class Probe
 		}
 
 		// If it is not JSON, maybe it is XML
-		$xrd = parse_xml_string($data, false);
+		$xrd = XML::parseString($data, false);
 		if (!is_object($xrd)) {
 			logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
 			return false;
@@ -718,7 +758,7 @@ class Probe
 			return false;
 		}
 
-		$webfinger = array();
+		$webfinger = [];
 
 		if (!empty($xrd_arr["xrd"]["subject"])) {
 			$webfinger["subject"] = $xrd_arr["xrd"]["subject"];
@@ -728,7 +768,7 @@ class Probe
 			$webfinger["aliases"] = $xrd_arr["xrd"]["alias"];
 		}
 
-		$webfinger["links"] = array();
+		$webfinger["links"] = [];
 
 		foreach ($xrd_arr["xrd"]["link"] as $value => $data) {
 			if (!empty($data["@attributes"])) {
@@ -757,8 +797,8 @@ class Probe
 	 */
 	private static function pollNoscrape($noscrape_url, $data)
 	{
-		$ret = z_fetch_url($noscrape_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$ret = Network::curl($noscrape_url);
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$content = $ret['body'];
@@ -873,12 +913,12 @@ class Probe
 	 */
 	public static function profile($profile_link)
 	{
-		$data = array();
+		$data = [];
 
 		logger("Check profile ".$profile_link, LOGGER_DEBUG);
 
 		// Fetch data via noscrape - this is faster
-		$noscrape_url = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile_link);
+		$noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link);
 		$data = self::pollNoscrape($noscrape_url, $data);
 
 		if (!isset($data["notify"])
@@ -892,7 +932,7 @@ class Probe
 			$data = self::pollHcard($profile_link, $data, true);
 		}
 
-		$prof_data = array();
+		$prof_data = [];
 		$prof_data["addr"]         = $data["addr"];
 		$prof_data["nick"]         = $data["nick"];
 		$prof_data["dfrn-request"] = $data["request"];
@@ -919,7 +959,7 @@ class Probe
 	private static function dfrn($webfinger)
 	{
 		$hcard_url = "";
-		$data = array();
+		$data = [];
 		foreach ($webfinger["links"] as $link) {
 			if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
 				$data["network"] = NETWORK_DFRN;
@@ -942,12 +982,12 @@ class Probe
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
 				if (strstr($data["pubkey"], 'RSA ')) {
-					$data["pubkey"] = rsatopem($data["pubkey"]);
+					$data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
 				}
 			}
 		}
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
 				if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
 					$data["alias"] = $alias;
@@ -957,6 +997,10 @@ class Probe
 			}
 		}
 
+		if (!empty($webfinger["subject"]) && (substr($webfinger["subject"], 0, 5) == "acct:")) {
+			$data["addr"] = substr($webfinger["subject"], 5);
+		}
+
 		if (!isset($data["network"]) || ($hcard_url == "")) {
 			return false;
 		}
@@ -991,8 +1035,8 @@ class Probe
 	 */
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
-		$ret = z_fetch_url($hcard_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$ret = Network::curl($hcard_url);
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$content = $ret['body'];
@@ -1012,13 +1056,17 @@ class Probe
 			return false;
 		}
 
+		if (!isset($data["baseurl"])) {
+			$data["baseurl"] = "";
+		}
+
 		if ($vcards->length > 0) {
 			$vcard = $vcards->item(0);
 
 			// We have to discard the guid from the hcard in favour of the guid from lrdd
 			// Reason: Hubzilla doesn't use the value "uid" in the hcard like Diaspora does.
 			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' uid ')]", $vcard); // */
-			if (($search->length > 0) && ($data["guid"] == "")) {
+			if (($search->length > 0) && empty($data["guid"])) {
 				$data["guid"] = $search->item(0)->nodeValue;
 			}
 
@@ -1041,7 +1089,7 @@ class Probe
 			if ($search->length > 0) {
 				$data["pubkey"] = $search->item(0)->nodeValue;
 				if (strstr($data["pubkey"], 'RSA ')) {
-					$data["pubkey"] = rsatopem($data["pubkey"]);
+					$data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
 				}
 			}
 
@@ -1051,22 +1099,24 @@ class Probe
 			}
 		}
 
-		$avatar = array();
-		$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
-		foreach ($photos as $photo) {
-			$attr = array();
-			foreach ($photo->attributes as $attribute) {
-				$attr[$attribute->name] = trim($attribute->value);
-			}
+		$avatar = [];
+		if (!empty($vcard)) {
+			$photos = $xpath->query("//*[contains(concat(' ', @class, ' '), ' photo ') or contains(concat(' ', @class, ' '), ' avatar ')]", $vcard); // */
+			foreach ($photos as $photo) {
+				$attr = [];
+				foreach ($photo->attributes as $attribute) {
+					$attr[$attribute->name] = trim($attribute->value);
+				}
 
-			if (isset($attr["src"]) && isset($attr["width"])) {
-				$avatar[$attr["width"]] = $attr["src"];
-			}
+				if (isset($attr["src"]) && isset($attr["width"])) {
+					$avatar[$attr["width"]] = $attr["src"];
+				}
 
-			// We don't have a width. So we just take everything that we got.
-			// This is a Hubzilla workaround which doesn't send a width.
-			if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
-				$avatar[] = $attr["src"];
+				// We don't have a width. So we just take everything that we got.
+				// This is a Hubzilla workaround which doesn't send a width.
+				if ((sizeof($avatar) == 0) && !empty($attr["src"])) {
+					$avatar[] = $attr["src"];
+				}
 			}
 		}
 
@@ -1081,7 +1131,7 @@ class Probe
 			if ($search->length > 0) {
 				foreach ($search as $link) {
 					//$data["request"] = $search->item(0)->nodeValue;
-					$attr = array();
+					$attr = [];
 					foreach ($link->attributes as $attribute) {
 						$attr[$attribute->name] = trim($attribute->value);
 					}
@@ -1091,7 +1141,7 @@ class Probe
 			}
 
 			// Older Friendica versions had used the "uid" field differently than newer versions
-			if ($data["nick"] == $data["guid"]) {
+			if (!empty($data["nick"]) && !empty($data["guid"]) && ($data["nick"] == $data["guid"])) {
 				unset($data["guid"]);
 			}
 		}
@@ -1110,7 +1160,7 @@ class Probe
 	private static function diaspora($webfinger)
 	{
 		$hcard_url = "";
-		$data = array();
+		$data = [];
 		foreach ($webfinger["links"] as $link) {
 			if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
 				$hcard_url = $link["href"];
@@ -1131,7 +1181,7 @@ class Probe
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
 				if (strstr($data["pubkey"], 'RSA ')) {
-					$data["pubkey"] = rsatopem($data["pubkey"]);
+					$data["pubkey"] = Crypto::rsaToPem($data["pubkey"]);
 				}
 			}
 		}
@@ -1140,7 +1190,7 @@ class Probe
 			return false;
 		}
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
 				if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
 					$data["alias"] = $alias;
@@ -1170,7 +1220,9 @@ class Probe
 			$data["network"] = NETWORK_DIASPORA;
 
 			// The Diaspora handle must always be lowercase
-			$data["addr"] = strtolower($data["addr"]);
+			if (!empty($data["addr"])) {
+				$data["addr"] = strtolower($data["addr"]);
+			}
 
 			// We have to overwrite the detected value for "notify" since Hubzilla doesn't send it
 			$data["notify"] = $data["baseurl"] . "/receive/users/" . $data["guid"];
@@ -1192,9 +1244,9 @@ class Probe
 	 */
 	private static function ostatus($webfinger, $short = false)
 	{
-		$data = array();
+		$data = [];
 
-		if (is_array($webfinger["aliases"])) {
+		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
 				if (strstr($alias, "@") && !strstr(normalise_link($alias), "http://")) {
 					$data["addr"] = str_replace('acct:', '', $alias);
@@ -1202,7 +1254,7 @@ class Probe
 			}
 		}
 
-		if (is_string($webfinger["subject"]) && strstr($webfinger["subject"], "@")
+		if (!empty($webfinger["subject"]) && strstr($webfinger["subject"], "@")
 			&& !strstr(normalise_link($webfinger["subject"]), "http://")
 		) {
 			$data["addr"] = str_replace('acct:', '', $webfinger["subject"]);
@@ -1230,8 +1282,8 @@ class Probe
 							$pubkey = substr($pubkey, 5);
 						}
 					} elseif (normalise_link($pubkey) == 'http://') {
-						$ret = z_fetch_url($pubkey);
-						if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+						$ret = Network::curl($pubkey);
+						if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 							return false;
 						}
 						$pubkey = $ret['body'];
@@ -1242,7 +1294,7 @@ class Probe
 					if (sizeof($key) >= 3) {
 						$m = base64url_decode($key[1]);
 						$e = base64url_decode($key[2]);
-						$data["pubkey"] = metopem($m, $e);
+						$data["pubkey"] = Crypto::meToPem($m, $e);
 					}
 				}
 			}
@@ -1262,37 +1314,40 @@ class Probe
 		}
 
 		// Fetch all additional data from the feed
-		$ret = z_fetch_url($data["poll"]);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$ret = Network::curl($data["poll"]);
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$feed = $ret['body'];
-		$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+		$dummy1 = null;
+		$dummy2 = null;
+		$dummy2 = null;
+		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 		if (!$feed_data) {
 			return false;
 		}
 
-		if ($feed_data["header"]["author-name"] != "") {
+		if (!empty($feed_data["header"]["author-name"])) {
 			$data["name"] = $feed_data["header"]["author-name"];
 		}
-		if ($feed_data["header"]["author-nick"] != "") {
+		if (!empty($feed_data["header"]["author-nick"])) {
 			$data["nick"] = $feed_data["header"]["author-nick"];
 		}
-		if ($feed_data["header"]["author-avatar"] != "") {
+		if (!empty($feed_data["header"]["author-avatar"])) {
 			$data["photo"] = self::fixAvatar($feed_data["header"]["author-avatar"], $data["url"]);
 		}
-		if ($feed_data["header"]["author-id"] != "") {
+		if (!empty($feed_data["header"]["author-id"])) {
 			$data["alias"] = $feed_data["header"]["author-id"];
 		}
-		if ($feed_data["header"]["author-location"] != "") {
+		if (!empty($feed_data["header"]["author-location"])) {
 			$data["location"] = $feed_data["header"]["author-location"];
 		}
-		if ($feed_data["header"]["author-about"] != "") {
+		if (!empty($feed_data["header"]["author-about"])) {
 			$data["about"] = $feed_data["header"]["author-about"];
 		}
 		// OStatus has serious issues when the the url doesn't fit (ssl vs. non ssl)
 		// So we take the value that we just fetched, although the other one worked as well
-		if ($feed_data["header"]["author-link"] != "") {
+		if (!empty($feed_data["header"]["author-link"])) {
 			$data["url"] = $feed_data["header"]["author-link"];
 		}
 
@@ -1321,16 +1376,35 @@ class Probe
 
 		$xpath = new DomXPath($doc);
 
-		$data = array();
+		$data = [];
+
+		$data["name"] = $xpath->query("//span[contains(@class, 'p-name')]")->item(0)->nodeValue;
+
+		if ($data["name"] == '') {
+			// This is ugly - but pump.io doesn't seem to know a better way for it
+			$data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
+			$pos = strpos($data["name"], chr(10));
+			if ($pos) {
+				$data["name"] = trim(substr($data["name"], 0, $pos));
+			}
+		}
+
+		$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-locality')]");
 
-		// This is ugly - but pump.io doesn't seem to know a better way for it
-		$data["name"] = trim($xpath->query("//h1[@class='media-header']")->item(0)->nodeValue);
-		$pos = strpos($data["name"], chr(10));
-		if ($pos) {
-			$data["name"] = trim(substr($data["name"], 0, $pos));
+		if ($data["location"] == '') {
+			$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'location')]");
 		}
 
-		$avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+		$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-note')]");
+
+		if ($data["about"] == '') {
+			$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'summary')]");
+		}
+
+		$avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0);
+		if (!$avatar) {
+			$avatar = $xpath->query("//img[@class='img-rounded media-object']")->item(0);
+		}
 		if ($avatar) {
 			foreach ($avatar->attributes as $attribute) {
 				if ($attribute->name == "src") {
@@ -1339,9 +1413,6 @@ class Probe
 			}
 		}
 
-		$data["location"] = $xpath->query("//p[@class='location']")->item(0)->nodeValue;
-		$data["about"] = $xpath->query("//p[@class='summary']")->item(0)->nodeValue;
-
 		return $data;
 	}
 
@@ -1352,9 +1423,9 @@ class Probe
 	 *
 	 * @return array pump.io data
 	 */
-	private static function pumpio($webfinger)
+	private static function pumpio($webfinger, $addr)
 	{
-		$data = array();
+		$data = [];
 		foreach ($webfinger["links"] as $link) {
 			if (($link["rel"] == "http://webfinger.net/rel/profile-page")
 				&& ($link["type"] == "text/html")
@@ -1390,6 +1461,13 @@ class Probe
 
 		$data = array_merge($data, $profile_data);
 
+		if (($addr != '') && ($data['name'] != '')) {
+			$name = trim(str_replace($addr, '', $data['name']));
+			if ($name != '') {
+				$data['name'] = $name;
+			}
+		}
+
 		return $data;
 	}
 
@@ -1423,7 +1501,7 @@ class Probe
 		$feed_url = "";
 
 		foreach ($feeds as $feed) {
-			$attr = array();
+			$attr = [];
 			foreach ($feed->attributes as $attribute) {
 				$attr[$attribute->name] = trim($attribute->value);
 			}
@@ -1446,12 +1524,13 @@ class Probe
 	 */
 	private static function feed($url, $probe = true)
 	{
-		$ret = z_fetch_url($url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$ret = Network::curl($url);
+		if (!empty($ret["errno"]) && ($ret['errno'] == CURLE_OPERATION_TIMEDOUT)) {
 			return false;
 		}
 		$feed = $ret['body'];
-		$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
+		$dummy1 = $dummy2 = $dummy3 = null;
+		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 
 		if (!$feed_data) {
 			if (!$probe) {
@@ -1467,26 +1546,26 @@ class Probe
 			return self::feed($feed_url, false);
 		}
 
-		if ($feed_data["header"]["author-name"] != "") {
+		if (!empty($feed_data["header"]["author-name"])) {
 			$data["name"] = $feed_data["header"]["author-name"];
 		}
 
-		if ($feed_data["header"]["author-nick"] != "") {
+		if (!empty($feed_data["header"]["author-nick"])) {
 			$data["nick"] = $feed_data["header"]["author-nick"];
 		}
 
-		if ($feed_data["header"]["author-avatar"] != "") {
+		if (!empty($feed_data["header"]["author-avatar"])) {
 			$data["photo"] = $feed_data["header"]["author-avatar"];
 		}
 
-		if ($feed_data["header"]["author-id"] != "") {
+		if (!empty($feed_data["header"]["author-id"])) {
 			$data["alias"] = $feed_data["header"]["author-id"];
 		}
 
 		$data["url"] = $url;
 		$data["poll"] = $url;
 
-		if ($feed_data["header"]["author-link"] != "") {
+		if (!empty($feed_data["header"]["author-link"])) {
 			$data["baseurl"] = $feed_data["header"]["author-link"];
 		} else {
 			$data["baseurl"] = $data["url"];
@@ -1507,41 +1586,43 @@ class Probe
 	 */
 	private static function mail($uri, $uid)
 	{
-		if (!validate_email($uri)) {
+		if (!Network::isEmailDomainValid($uri)) {
 			return false;
 		}
 
-		if ($uid != 0) {
-			$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+		if ($uid == 0) {
+			return false;
+		}
 
-			$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+		$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
 
-			if (DBM::is_result($x) && DBM::is_result($r)) {
-				$mailbox = Email::constructMailboxName($r[0]);
-				$password = '';
-				openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
-				$mbox = Email::connect($mailbox, $r[0]['user'], $password);
-				if (!mbox) {
-					return false;
-				}
-			}
-
-			$msgs = Email::poll($mbox, $uri);
-			logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-			if (!count($msgs)) {
+		if (DBM::is_result($x) && DBM::is_result($r)) {
+			$mailbox = Email::constructMailboxName($r[0]);
+			$password = '';
+			openssl_private_decrypt(hex2bin($r[0]['pass']), $password, $x[0]['prvkey']);
+			$mbox = Email::connect($mailbox, $r[0]['user'], $password);
+			if (!$mbox) {
 				return false;
 			}
 		}
 
+		$msgs = Email::poll($mbox, $uri);
+		logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+
+		if (!count($msgs)) {
+			return false;
+		}
+
 		$phost = substr($uri, strpos($uri, '@') + 1);
 
-		$data = array();
+		$data = [];
 		$data["addr"]    = $uri;
 		$data["network"] = NETWORK_MAIL;
 		$data["name"]    = substr($uri, 0, strpos($uri, '@'));
 		$data["nick"]    = $data["name"];
-		$data["photo"]   = avatar_img($uri);
+		$data["photo"]   = Network::lookupAvatarByEmail($uri);
 		$data["url"]     = 'mailto:'.$uri;
 		$data["notify"]  = 'smtp '.random_string();
 		$data["poll"]    = 'email '.random_string();