X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=894d9abe52858c355670e0d2e0ec74b0f17d79d2;hb=14fde5dc9b1915392601fb94efc6224c01f2b216;hp=d706089e8d9d497adc007377d280cfbd857b2992;hpb=6cf50a14fae25210a0cdb617c29d549abcfde9ac;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index d706089e8d..894d9abe52 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -9,21 +9,23 @@ 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\Database\DBM;
+use Friendica\Core\Logger;
+use Friendica\Core\Protocol;
+use Friendica\Core\System;
+use Friendica\Database\DBA;
+use Friendica\Model\Contact;
 use Friendica\Model\Profile;
 use Friendica\Protocol\Email;
 use Friendica\Protocol\Feed;
+use Friendica\Protocol\ActivityPub;
 use Friendica\Util\Crypto;
+use Friendica\Util\DateTimeFormat;
 use Friendica\Util\Network;
 use Friendica\Util\XML;
-use Friendica\Util\DateTimeFormat;
-use dba;
-use DOMXPath;
-use DOMDocument;
+use DomXPath;
 
 require_once 'include/dba.php';
 
@@ -73,7 +75,7 @@ class Probe
 	 */
 	private static function ownHost($host)
 	{
-		$own_host = get_app()->get_hostname();
+		$own_host = get_app()->getHostName();
 
 		$parts = parse_url($host);
 
@@ -108,34 +110,34 @@ class Probe
 		$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
 		$redirects = 0;
 
-		logger("Probing for ".$host, LOGGER_DEBUG);
+		Logger::log("Probing for ".$host, LOGGER_DEBUG);
 		$xrd = null;
 
-		$ret = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
-		if ($ret['success']) {
-			$xml = $ret['body'];
+		$curlResult = Network::curl($ssl_url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+		if ($curlResult->isSuccess()) {
+			$xml = $curlResult->getBody();
 			$xrd = XML::parseString($xml, false);
 			$host_url = 'https://'.$host;
 		}
 
 		if (!is_object($xrd)) {
-			$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
-			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
-				logger("Probing timeout for ".$url, LOGGER_DEBUG);
+			$curlResult = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			if ($curlResult->isTimeout()) {
+				Logger::log("Probing timeout for " . $url, LOGGER_DEBUG);
 				return false;
 			}
-			$xml = $ret['body'];
+			$xml = $curlResult->getBody();
 			$xrd = XML::parseString($xml, false);
 			$host_url = 'http://'.$host;
 		}
 		if (!is_object($xrd)) {
-			logger("No xrd object found for ".$host, LOGGER_DEBUG);
+			Logger::log("No xrd object found for ".$host, LOGGER_DEBUG);
 			return [];
 		}
 
 		$links = XML::elementToArray($xrd);
 		if (!isset($links["xrd"]["link"])) {
-			logger("No xrd data found for ".$host, LOGGER_DEBUG);
+			Logger::log("No xrd data found for ".$host, LOGGER_DEBUG);
 			return [];
 		}
 
@@ -163,7 +165,7 @@ class Probe
 
 		self::$baseurl = "http://".$host;
 
-		logger("Probing successful for ".$host, LOGGER_DEBUG);
+		Logger::log("Probing successful for ".$host, LOGGER_DEBUG);
 
 		return $lrdd;
 	}
@@ -193,7 +195,7 @@ class Probe
 		$profile_link = '';
 
 		$links = self::lrdd($webbie);
-		logger('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
+		Logger::log('webfingerDfrn: '.$webbie.':'.print_r($links, true), LOGGER_DATA);
 		if (count($links)) {
 			foreach ($links as $link) {
 				if ($link['@attributes']['rel'] === NAMESPACE_DFRN) {
@@ -232,7 +234,7 @@ class Probe
 
 		if (!$lrdd) {
 			$parts = @parse_url($uri);
-			if (!$parts) {
+			if (!$parts || empty($parts["host"]) || empty($parts["path"])) {
 				return [];
 			}
 
@@ -252,7 +254,7 @@ class Probe
 		}
 
 		if (!$lrdd) {
-			logger("No lrdd data found for ".$uri, LOGGER_DEBUG);
+			Logger::log("No lrdd data found for ".$uri, LOGGER_DEBUG);
 			return [];
 		}
 
@@ -284,7 +286,7 @@ class Probe
 		}
 
 		if (!is_array($webfinger["links"])) {
-			logger("No webfinger links found for ".$uri, LOGGER_DEBUG);
+			Logger::log("No webfinger links found for ".$uri, LOGGER_DEBUG);
 			return false;
 		}
 
@@ -328,16 +330,26 @@ class Probe
 			$uid = local_user();
 		}
 
-		$data = self::detect($uri, $network, $uid);
+		if ($network != Protocol::ACTIVITYPUB) {
+			$data = self::detect($uri, $network, $uid);
+		} else {
+			$data = null;
+		}
+
+		$ap_profile = ActivityPub::probeProfile($uri);
+
+		if (!empty($ap_profile) && (defaults($data, 'network', '') != Protocol::DFRN)) {
+			$data = $ap_profile;
+		}
 
 		if (!isset($data["url"])) {
 			$data["url"] = $uri;
 		}
 
 		if (x($data, "photo")) {
-			$data["baseurl"] = Network::getUrlMatch(normalise_link($data["baseurl"]), normalise_link($data["photo"]));
+			$data["baseurl"] = Network::getUrlMatch(normalise_link(defaults($data, "baseurl", "")), normalise_link($data["photo"]));
 		} else {
-			$data["photo"] = System::baseUrl().'/images/person-175.jpg';
+			$data["photo"] = System::baseUrl().'/images/person-300.jpg';
 		}
 
 		if (empty($data["name"])) {
@@ -363,20 +375,20 @@ class Probe
 		}
 
 		if (empty($data["network"])) {
-			$data["network"] = NETWORK_PHANTOM;
+			$data["network"] = Protocol::PHANTOM;
 		}
 
 		$data = self::rearrangeData($data);
 
 		// Only store into the cache if the value seems to be valid
-		if (!in_array($data['network'], [NETWORK_PHANTOM, NETWORK_MAIL])) {
-			Cache::set("Probe::uri:".$network.":".$uri, $data, CACHE_DAY);
+		if (!in_array($data['network'], [Protocol::PHANTOM, Protocol::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
 			/// The biggest problem is the avatar picture that could have a reduced image size.
 			/// It should only be updated if the existing picture isn't existing anymore.
 			/// We only update the contact when it is no probing for a specific network.
-			if (($data['network'] != NETWORK_FEED)
+			if (($data['network'] != Protocol::FEED)
 				&& ($network == "")
 				&& $data["name"]
 				&& $data["nick"]
@@ -399,7 +411,7 @@ class Probe
 				// 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;
+					$fields['contact-type'] = Contact::ACCOUNT_TYPE_COMMUNITY;
 				}
 
 				$fieldnames = [];
@@ -412,11 +424,11 @@ class Probe
 					}
 				}
 
-				$fields['updated'] = DBM::date();
+				$fields['updated'] = DateTimeFormat::utcNow();
 
 				$condition = ['nurl' => normalise_link($data["url"])];
 
-				$old_fields = dba::selectFirst('gcontact', $fieldnames, $condition);
+				$old_fields = DBA::selectFirst('gcontact', $fieldnames, $condition);
 
 				// 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
@@ -429,7 +441,7 @@ class Probe
 					$fields['created'] = DateTimeFormat::utcNow();
 				}
 
-				dba::update('gcontact', $fields, $condition, $old_fields);
+				DBA::update('gcontact', $fields, $condition, $old_fields);
 
 				$fields = ['name' => $data['name'],
 						'nick' => $data['nick'],
@@ -449,7 +461,7 @@ class Probe
 						'pubkey' => $data['pubkey'],
 						'priority' => $data['priority'],
 						'writable' => true,
-						'rel' => CONTACT_IS_SHARING];
+						'rel' => Contact::SHARING];
 
 				$fieldnames = [];
 
@@ -467,13 +479,13 @@ class Probe
 				// 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);
+				$old_fields = DBA::selectFirst('contact', $fieldnames, $condition);
 
 				$fields['name-date'] = DateTimeFormat::utcNow();
 				$fields['uri-date'] = DateTimeFormat::utcNow();
 				$fields['success_update'] = DateTimeFormat::utcNow();
 
-				dba::update('contact', $fields, $condition, $old_fields);
+				DBA::update('contact', $fields, $condition, $old_fields);
 			}
 		}
 
@@ -569,7 +581,7 @@ class Probe
 			}
 
 			if ($host == 'twitter.com') {
-				return ["network" => NETWORK_TWITTER];
+				return ["network" => Protocol::TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
@@ -584,7 +596,7 @@ class Probe
 				$lrdd = self::hostMeta($host);
 			}
 			if (!$lrdd) {
-				logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
+				Logger::log('No XRD data was found for '.$uri, LOGGER_DEBUG);
 				return self::feed($uri);
 			}
 			$nick = array_pop($path_parts);
@@ -600,7 +612,7 @@ class Probe
 				return self::mail($uri, $uid);
 			}
 
-			if ($network == NETWORK_MAIL) {
+			if ($network == Protocol::MAIL) {
 				return self::mail($uri, $uid);
 			}
 			// Remove "acct:" from the URI
@@ -610,7 +622,7 @@ class Probe
 			$nick = substr($uri, 0, strpos($uri, '@'));
 
 			if (strpos($uri, '@twitter.com')) {
-				return ["network" => NETWORK_TWITTER];
+				return ["network" => Protocol::TWITTER];
 			}
 			$lrdd = self::hostMeta($host);
 
@@ -619,12 +631,12 @@ class Probe
 			}
 
 			if (!$lrdd) {
-				logger('No XRD data was found for '.$uri, LOGGER_DEBUG);
+				Logger::log('No XRD data was found for '.$uri, LOGGER_DEBUG);
 				return self::mail($uri, $uid);
 			}
 			$addr = $uri;
 		} else {
-			logger("Uri ".$uri." was not detectable", LOGGER_DEBUG);
+			Logger::log("Uri ".$uri." was not detectable", LOGGER_DEBUG);
 			return false;
 		}
 
@@ -669,21 +681,21 @@ class Probe
 
 		$result = false;
 
-		logger("Probing ".$uri, LOGGER_DEBUG);
+		Logger::log("Probing ".$uri, LOGGER_DEBUG);
 
-		if (in_array($network, ["", NETWORK_DFRN])) {
+		if (in_array($network, ["", Protocol::DFRN])) {
 			$result = self::dfrn($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_DIASPORA)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::DIASPORA)) {
 			$result = self::diaspora($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_OSTATUS)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::OSTATUS)) {
 			$result = self::ostatus($webfinger);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_PUMPIO)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::PUMPIO)) {
 			$result = self::pumpio($webfinger, $addr);
 		}
-		if ((!$result && ($network == "")) || ($network == NETWORK_FEED)) {
+		if ((!$result && ($network == "")) || ($network == Protocol::FEED)) {
 			$result = self::feed($uri);
 		} else {
 			// We overwrite the detected nick with our try if the previois routines hadn't detected it.
@@ -698,14 +710,14 @@ class Probe
 		}
 
 		if (empty($result["network"])) {
-			$result["network"] = NETWORK_PHANTOM;
+			$result["network"] = Protocol::PHANTOM;
 		}
 
 		if (empty($result["url"])) {
 			$result["url"] = $uri;
 		}
 
-		logger($uri." is ".$result["network"], LOGGER_DEBUG);
+		Logger::log($uri." is ".$result["network"], LOGGER_DEBUG);
 
 		if (empty($result["baseurl"])) {
 			$pos = strpos($result["url"], $host);
@@ -731,16 +743,16 @@ class Probe
 		$xrd_timeout = Config::get('system', 'xrd_timeout', 20);
 		$redirects = 0;
 
-		$ret = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$curlResult = Network::curl($url, false, $redirects, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+		if ($curlResult->isTimeout()) {
 			return false;
 		}
-		$data = $ret['body'];
+		$data = $curlResult->getBody();
 
 		$webfinger = json_decode($data, true);
 		if (is_array($webfinger)) {
 			if (!isset($webfinger["links"])) {
-				logger("No json webfinger links for ".$url, LOGGER_DEBUG);
+				Logger::log("No json webfinger links for ".$url, LOGGER_DEBUG);
 				return false;
 			}
 			return $webfinger;
@@ -749,13 +761,13 @@ class Probe
 		// If it is not JSON, maybe it is XML
 		$xrd = XML::parseString($data, false);
 		if (!is_object($xrd)) {
-			logger("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
+			Logger::log("No webfinger data retrievable for ".$url, LOGGER_DEBUG);
 			return false;
 		}
 
 		$xrd_arr = XML::elementToArray($xrd);
 		if (!isset($xrd_arr["xrd"]["link"])) {
-			logger("No XML webfinger links for ".$url, LOGGER_DEBUG);
+			Logger::log("No XML webfinger links for ".$url, LOGGER_DEBUG);
 			return false;
 		}
 
@@ -798,19 +810,19 @@ class Probe
 	 */
 	private static function pollNoscrape($noscrape_url, $data)
 	{
-		$ret = Network::curl($noscrape_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$curlResult = Network::curl($noscrape_url);
+		if ($curlResult->isTimeout()) {
 			return false;
 		}
-		$content = $ret['body'];
+		$content = $curlResult->getBody();
 		if (!$content) {
-			logger("Empty body for ".$noscrape_url, LOGGER_DEBUG);
+			Logger::log("Empty body for ".$noscrape_url, LOGGER_DEBUG);
 			return false;
 		}
 
 		$json = json_decode($content, true);
 		if (!is_array($json)) {
-			logger("No json data for ".$noscrape_url, LOGGER_DEBUG);
+			Logger::log("No json data for ".$noscrape_url, LOGGER_DEBUG);
 			return false;
 		}
 
@@ -916,7 +928,7 @@ class Probe
 	{
 		$data = [];
 
-		logger("Check profile ".$profile_link, LOGGER_DEBUG);
+		Logger::log("Check profile ".$profile_link, LOGGER_DEBUG);
 
 		// Fetch data via noscrape - this is faster
 		$noscrape_url = str_replace(["/hcard/", "/profile/"], "/noscrape/", $profile_link);
@@ -926,7 +938,6 @@ class Probe
 			|| !isset($data["confirm"])
 			|| !isset($data["request"])
 			|| !isset($data["poll"])
-			|| !isset($data["poco"])
 			|| !isset($data["name"])
 			|| !isset($data["photo"])
 		) {
@@ -934,18 +945,24 @@ class Probe
 		}
 
 		$prof_data = [];
+
+		if (empty($data["addr"]) || empty($data["nick"])) {
+			$probe_data = self::uri($profile_link);
+			$data["addr"] = defaults($data, "addr", $probe_data["addr"]);
+			$data["nick"] = defaults($data, "nick", $probe_data["nick"]);
+		}
+
 		$prof_data["addr"]         = $data["addr"];
 		$prof_data["nick"]         = $data["nick"];
-		$prof_data["dfrn-request"] = $data["request"];
-		$prof_data["dfrn-confirm"] = $data["confirm"];
-		$prof_data["dfrn-notify"]  = $data["notify"];
-		$prof_data["dfrn-poll"]    = $data["poll"];
-		$prof_data["dfrn-poco"]    = $data["poco"];
-		$prof_data["photo"]        = $data["photo"];
-		$prof_data["fn"]           = $data["name"];
-		$prof_data["key"]          = $data["pubkey"];
+		$prof_data["dfrn-request"] = defaults($data, 'request', null);
+		$prof_data["dfrn-confirm"] = defaults($data, 'confirm', null);
+		$prof_data["dfrn-notify"]  = defaults($data, 'notify' , null);
+		$prof_data["dfrn-poll"]    = defaults($data, 'poll'   , null);
+		$prof_data["photo"]        = defaults($data, 'photo'  , null);
+		$prof_data["fn"]           = defaults($data, 'name'   , null);
+		$prof_data["key"]          = defaults($data, 'pubkey' , null);
 
-		logger("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
+		Logger::log("Result for profile ".$profile_link.": ".print_r($prof_data, true), LOGGER_DEBUG);
 
 		return $prof_data;
 	}
@@ -962,23 +979,23 @@ class Probe
 		$hcard_url = "";
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
-			if (($link["rel"] == NAMESPACE_DFRN) && ($link["href"] != "")) {
-				$data["network"] = NETWORK_DFRN;
-			} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+			if (($link["rel"] == NAMESPACE_DFRN) && !empty($link["href"])) {
+				$data["network"] = Protocol::DFRN;
+			} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 				$data["poll"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
 				$data["url"] = $link["href"];
-			} elseif (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
 				$hcard_url = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
 				$data["poco"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/avatar") && !empty($link["href"])) {
 				$data["photo"] = $link["href"];
-			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) {
 				$data["baseurl"] = trim($link["href"], '/');
-			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
 				$data["guid"] = $link["href"];
-			} elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "diaspora-public-key") && !empty($link["href"])) {
 				$data["pubkey"] = base64_decode($link["href"]);
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
@@ -990,7 +1007,9 @@ class Probe
 
 		if (!empty($webfinger["aliases"]) && is_array($webfinger["aliases"])) {
 			foreach ($webfinger["aliases"] as $alias) {
-				if (normalise_link($alias) != normalise_link($data["url"]) && ! strstr($alias, "@")) {
+				if (empty($data["url"]) && !strstr($alias, "@")) {
+					$data["url"] = $alias;
+				} elseif (!strstr($alias, "@") && normalise_link($alias) != normalise_link($data["url"])) {
 					$data["alias"] = $alias;
 				} elseif (substr($alias, 0, 5) == 'acct:') {
 					$data["addr"] = substr($alias, 5);
@@ -1036,11 +1055,11 @@ class Probe
 	 */
 	private static function pollHcard($hcard_url, $data, $dfrn = false)
 	{
-		$ret = Network::curl($hcard_url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$curlResult = Network::curl($hcard_url);
+		if ($curlResult->isTimeout()) {
 			return false;
 		}
-		$content = $ret['body'];
+		$content = $curlResult->getBody();
 		if (!$content) {
 			return false;
 		}
@@ -1142,7 +1161,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"]);
 			}
 		}
@@ -1163,21 +1182,21 @@ class Probe
 		$hcard_url = "";
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
-			if (($link["rel"] == "http://microformats.org/profile/hcard") && ($link["href"] != "")) {
+			if (($link["rel"] == "http://microformats.org/profile/hcard") && !empty($link["href"])) {
 				$hcard_url = $link["href"];
-			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/seed_location") && !empty($link["href"])) {
 				$data["baseurl"] = trim($link["href"], '/');
-			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://joindiaspora.com/guid") && !empty($link["href"])) {
 				$data["guid"] = $link["href"];
-			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && ($link["type"] == "text/html") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "http://webfinger.net/rel/profile-page") && (defaults($link, "type", "") == "text/html") && !empty($link["href"])) {
 				$data["url"] = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 				$data["poll"] = $link["href"];
-			} elseif (($link["rel"] == NAMESPACE_POCO) && ($link["href"] != "")) {
+			} elseif (($link["rel"] == NAMESPACE_POCO) && !empty($link["href"])) {
 				$data["poco"] = $link["href"];
-			} elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
 				$data["notify"] = $link["href"];
-			} elseif (($link["rel"] == "diaspora-public-key") && ($link["href"] != "")) {
+			} elseif (($link["rel"] == "diaspora-public-key") && !empty($link["href"])) {
 				$data["pubkey"] = base64_decode($link["href"]);
 
 				//if (strstr($data["pubkey"], 'RSA ') || ($link["type"] == "RSA"))
@@ -1218,7 +1237,7 @@ class Probe
 			&& isset($data["pubkey"])
 			&& ($hcard_url != "")
 		) {
-			$data["network"] = NETWORK_DIASPORA;
+			$data["network"] = Protocol::DIASPORA;
 
 			// The Diaspora handle must always be lowercase
 			if (!empty($data["addr"])) {
@@ -1265,15 +1284,15 @@ class Probe
 		if (is_array($webfinger["links"])) {
 			foreach ($webfinger["links"] as $link) {
 				if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-					&& ($link["type"] == "text/html")
+					&& (defaults($link, "type", "") == "text/html")
 					&& ($link["href"] != "")
 				) {
 					$data["url"] = $link["href"];
-				} elseif (($link["rel"] == "salmon") && ($link["href"] != "")) {
+				} elseif (($link["rel"] == "salmon") && !empty($link["href"])) {
 					$data["notify"] = $link["href"];
-				} elseif (($link["rel"] == NAMESPACE_FEED) && ($link["href"] != "")) {
+				} elseif (($link["rel"] == NAMESPACE_FEED) && !empty($link["href"])) {
 					$data["poll"] = $link["href"];
-				} elseif (($link["rel"] == "magic-public-key") && ($link["href"] != "")) {
+				} elseif (($link["rel"] == "magic-public-key") && !empty($link["href"])) {
 					$pubkey = $link["href"];
 
 					if (substr($pubkey, 0, 5) === 'data:') {
@@ -1283,11 +1302,11 @@ class Probe
 							$pubkey = substr($pubkey, 5);
 						}
 					} elseif (normalise_link($pubkey) == 'http://') {
-						$ret = Network::curl($pubkey);
-						if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+						$curlResult = Network::curl($pubkey);
+						if ($curlResult->isTimeout()) {
 							return false;
 						}
-						$pubkey = $ret['body'];
+						$pubkey = $curlResult['body'];
 					}
 
 					$key = explode(".", $pubkey);
@@ -1305,7 +1324,7 @@ class Probe
 			&& isset($data["poll"])
 			&& isset($data["url"])
 		) {
-			$data["network"] = NETWORK_OSTATUS;
+			$data["network"] = Protocol::OSTATUS;
 		} else {
 			return false;
 		}
@@ -1315,11 +1334,11 @@ class Probe
 		}
 
 		// Fetch all additional data from the feed
-		$ret = Network::curl($data["poll"]);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$curlResult = Network::curl($data["poll"]);
+		if ($curlResult->isTimeout()) {
 			return false;
 		}
-		$feed = $ret['body'];
+		$feed = $curlResult->getBody();
 		$dummy1 = null;
 		$dummy2 = null;
 		$dummy2 = null;
@@ -1390,16 +1409,16 @@ class Probe
 			}
 		}
 
-		$data["location"] = $xpath->query("//p[contains(@class, 'p-locality')]")->item(0)->nodeValue;
+		$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-locality')]");
 
 		if ($data["location"] == '') {
-			$data["location"] = $xpath->query("//p[contains(@class, 'location')]")->item(0)->nodeValue;
+			$data["location"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'location')]");
 		}
 
-		$data["about"] = $xpath->query("//p[contains(@class, 'p-note')]")->item(0)->nodeValue;
+		$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'p-note')]");
 
 		if ($data["about"] == '') {
-			$data["about"] = $xpath->query("//p[contains(@class, 'summary')]")->item(0)->nodeValue;
+			$data["about"] = XML::getFirstNodeValue($xpath, "//p[contains(@class, 'summary')]");
 		}
 
 		$avatar = $xpath->query("//img[contains(@class, 'u-photo')]")->item(0);
@@ -1429,7 +1448,7 @@ class Probe
 		$data = [];
 		foreach ($webfinger["links"] as $link) {
 			if (($link["rel"] == "http://webfinger.net/rel/profile-page")
-				&& ($link["type"] == "text/html")
+				&& (defaults($link, "type", "") == "text/html")
 				&& ($link["href"] != "")
 			) {
 				$data["url"] = $link["href"];
@@ -1449,7 +1468,7 @@ class Probe
 			// So we unset all data that isn't used at the moment
 			unset($data["dialback"]);
 
-			$data["network"] = NETWORK_PUMPIO;
+			$data["network"] = Protocol::PUMPIO;
 		} else {
 			return false;
 		}
@@ -1525,11 +1544,11 @@ class Probe
 	 */
 	private static function feed($url, $probe = true)
 	{
-		$ret = Network::curl($url);
-		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+		$curlResult = Network::curl($url);
+		if ($curlResult->isTimeout()) {
 			return false;
 		}
-		$feed = $ret['body'];
+		$feed = $curlResult->getBody();
 		$dummy1 = $dummy2 = $dummy3 = null;
 		$feed_data = Feed::import($feed, $dummy1, $dummy2, $dummy3, true);
 
@@ -1572,7 +1591,7 @@ class Probe
 			$data["baseurl"] = $data["url"];
 		}
 
-		$data["network"] = NETWORK_FEED;
+		$data["network"] = Protocol::FEED;
 
 		return $data;
 	}
@@ -1595,22 +1614,26 @@ class Probe
 			return false;
 		}
 
-		$x = q("SELECT `prvkey` FROM `user` WHERE `uid` = %d LIMIT 1", intval($uid));
+		$user = DBA::selectFirst('user', ['prvkey'], ['uid' => $uid]);
 
-		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
+		$condition = ["`uid` = ? AND `server` != ''", $uid];
+		$fields = ['pass', 'user', 'server', 'port', 'ssltype', 'mailbox'];
+		$mailacct = DBA::selectFirst('mailacct', $fields, $condition);
 
-		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;
-			}
+		if (!DBA::isResult($user) || !DBA::isResult($mailacct)) {
+			return false;
+		}
+
+		$mailbox = Email::constructMailboxName($mailacct);
+		$password = '';
+		openssl_private_decrypt(hex2bin($mailacct['pass']), $password, $user['prvkey']);
+		$mbox = Email::connect($mailbox, $mailacct['user'], $password);
+		if (!$mbox) {
+			return false;
 		}
 
 		$msgs = Email::poll($mbox, $uri);
-		logger('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
+		Logger::log('searching '.$uri.', '.count($msgs).' messages found.', LOGGER_DEBUG);
 
 		if (!count($msgs)) {
 			return false;
@@ -1620,7 +1643,7 @@ class Probe
 
 		$data = [];
 		$data["addr"]    = $uri;
-		$data["network"] = NETWORK_MAIL;
+		$data["network"] = Protocol::MAIL;
 		$data["name"]    = substr($uri, 0, strpos($uri, '@'));
 		$data["nick"]    = $data["name"];
 		$data["photo"]   = Network::lookupAvatarByEmail($uri);
@@ -1657,7 +1680,6 @@ class Probe
 		if (!empty($mbox)) {
 			imap_close($mbox);
 		}
-
 		return $data;
 	}
 
@@ -1693,7 +1715,7 @@ class Probe
 
 		$fixed = $scheme.$host.$port.$path.$query.$fragment;
 
-		logger('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
+		Logger::log('Base: '.$base.' - Avatar: '.$avatar.' - Fixed: '.$fixed, LOGGER_DATA);
 
 		return $fixed;
 	}