X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FProbe.php;h=1b6feb107f4d32cf260da732dac770b64247790d;hb=f94a10bf00de699a5f3d22ea74665053a5661175;hp=d8814036d91a5a357d2d5cf743d0876a2ca479af;hpb=a1c63994d24fa3c1d396fb623c5cb33995ac924f;p=friendica.git

diff --git a/include/Probe.php b/include/Probe.php
index d8814036d9..1b6feb107f 100644
--- a/include/Probe.php
+++ b/include/Probe.php
@@ -60,11 +60,20 @@ class Probe {
 		$xrd_timeout = Config::get('system','xrd_timeout', 20);
 		$redirects = 0;
 
-		$xml = fetch_url($ssl_url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+		$ret = z_fetch_url($ssl_url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			return false;
+		}
+		$xml = $ret['body'];
+
 		$xrd = parse_xml_string($xml, false);
 
 		if (!is_object($xrd)) {
-			$xml = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+			$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+			if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+				return false;
+			}
+			$xml = $ret['body'];
 			$xrd = parse_xml_string($xml, false);
 		}
 		if (!is_object($xrd))
@@ -118,18 +127,16 @@ class Probe {
 	 */
 
 	public static function webfinger_dfrn($webbie, &$hcard) {
-		if (!strstr($webbie, '@'))
-			return $webbie;
 
 		$profile_link = '';
 
-		$links = self::webfinger($webbie);
+		$links = self::lrdd($webbie);
 		logger('webfinger_dfrn: '.$webbie.':'.print_r($links,true), LOGGER_DATA);
 		if (count($links)) {
 			foreach ($links as $link) {
 				if ($link['@attributes']['rel'] === NAMESPACE_DFRN)
 					$profile_link = $link['@attributes']['href'];
-				if ($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB)
+				if (($link['@attributes']['rel'] === NAMESPACE_OSTATUSSUB) AND ($profile_link == ""))
 					$profile_link = 'stat:'.$link['@attributes']['template'];
 				if ($link['@attributes']['rel'] === 'http://microformats.org/profile/hcard')
 					$hcard = $link['@attributes']['href'];
@@ -219,7 +226,6 @@ class Probe {
 		if ($cache) {
 			$result = Cache::get("probe_url:".$network.":".$uri);
 			if (!is_null($result)) {
-				$result = unserialize($result);
 				return $result;
 			}
 		}
@@ -259,7 +265,7 @@ class Probe {
 
 		// Only store into the cache if the value seems to be valid
 		if (!in_array($data['network'], array(NETWORK_PHANTOM, NETWORK_MAIL))) {
-			Cache::set("probe_url:".$network.":".$uri,serialize($data), CACHE_DAY);
+			Cache::set("probe_url:".$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.
@@ -327,7 +333,7 @@ class Probe {
 				!isset($parts["path"]))
 				return false;
 
-			// todo: Ports?
+			/// @todo: Ports?
 			$host = $parts["host"];
 
 			if ($host == 'twitter.com')
@@ -433,7 +439,12 @@ class Probe {
 		$xrd_timeout = Config::get('system','xrd_timeout', 20);
 		$redirects = 0;
 
-		$data = fetch_url($url, false, $redirects, $xrd_timeout, "application/xrd+xml");
+		$ret = z_fetch_url($url, false, $redirects, array('timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml'));
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			return false;
+		}
+		$data = $ret['body'];
+
 		$xrd = parse_xml_string($data, false);
 
 		if (!is_object($xrd)) {
@@ -485,9 +496,14 @@ class Probe {
 	 * @return array noscrape data
 	 */
 	private function poll_noscrape($noscrape, $data) {
-		$content = fetch_url($noscrape);
-		if (!$content)
+		$ret = z_fetch_url($noscrape);
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
 			return false;
+		}
+		$content = $ret['body'];
+		if (!$content) {
+			return false;
+		}
 
 		$json = json_decode($content, true);
 		if (!is_array($json))
@@ -572,6 +588,8 @@ class Probe {
 
 		$data = array();
 
+		logger("Check profile ".$profile, LOGGER_DEBUG);
+
 		// Fetch data via noscrape - this is faster
 		$noscrape = str_replace(array("/hcard/", "/profile/"), "/noscrape/", $profile);
 		$data = self::poll_noscrape($noscrape, $data);
@@ -594,6 +612,8 @@ class Probe {
 		$prof_data["fn"] = $data["name"];
 		$prof_data["key"] = $data["pubkey"];
 
+		logger("Result for profile ".$profile.": ".print_r($prof_data, true), LOGGER_DEBUG);
+
 		return $prof_data;
 	}
 
@@ -662,9 +682,17 @@ class Probe {
 	 * @return array hcard data
 	 */
 	private function poll_hcard($hcard, $data, $dfrn = false) {
+		$ret = z_fetch_url($hcard);
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			return false;
+		}
+		$content = $ret['body'];
+		if (!$content) {
+			return false;
+		}
 
 		$doc = new DOMDocument();
-		if (!@$doc->loadHTMLFile($hcard))
+		if (!@$doc->loadHTML($content))
 			return false;
 
 		$xpath = new DomXPath($doc);
@@ -673,49 +701,56 @@ class Probe {
 		if (!is_object($vcards))
 			return false;
 
-		if ($vcards->length == 0)
-			return false;
+		if ($vcards->length > 0) {
+			$vcard = $vcards->item(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) AND ($data["guid"] == ""))
+				$data["guid"] = $search->item(0)->nodeValue;
 
-		// 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) AND ($data["guid"] == ""))
-			$data["guid"] = $search->item(0)->nodeValue;
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
+			if ($search->length > 0)
+				$data["nick"] = $search->item(0)->nodeValue;
 
-		$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' nickname ')]", $vcard); // */
-		if ($search->length > 0)
-			$data["nick"] = $search->item(0)->nodeValue;
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
+			if ($search->length > 0)
+				$data["name"] = $search->item(0)->nodeValue;
 
-		$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' fn ')]", $vcard); // */
-		if ($search->length > 0)
-			$data["name"] = $search->item(0)->nodeValue;
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
+			if ($search->length > 0)
+				$data["searchable"] = $search->item(0)->nodeValue;
 
-		$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' searchable ')]", $vcard); // */
-		if ($search->length > 0)
-			$data["searchable"] = $search->item(0)->nodeValue;
+			$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
+			if ($search->length > 0) {
+				$data["pubkey"] = $search->item(0)->nodeValue;
+				if (strstr($data["pubkey"], 'RSA '))
+					$data["pubkey"] = rsatopem($data["pubkey"]);
+			}
 
-		$search = $xpath->query("//*[contains(concat(' ', @class, ' '), ' key ')]", $vcard); // */
-		if ($search->length > 0) {
-			$data["pubkey"] = $search->item(0)->nodeValue;
-			if (strstr($data["pubkey"], 'RSA '))
-				$data["pubkey"] = rsatopem($data["pubkey"]);
+			$search = $xpath->query("//*[@id='pod_location']", $vcard); // */
+			if ($search->length > 0)
+				$data["baseurl"] = trim($search->item(0)->nodeValue, "/");
 		}
 
-		$search = $xpath->query("//*[@id='pod_location']", $vcard); // */
-		if ($search->length > 0)
-			$data["baseurl"] = trim($search->item(0)->nodeValue, "/");
-
 		$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)
+			foreach ($photo->attributes as $attribute) {
 				$attr[$attribute->name] = trim($attribute->value);
+			}
 
-			if (isset($attr["src"]) AND isset($attr["width"]))
+			if (isset($attr["src"]) AND 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) AND isset($attr["src"])) {
+				$avatar[] = $attr["src"];
+			}
 		}
 
 		if (sizeof($avatar)) {
@@ -847,8 +882,13 @@ class Probe {
 						$pubkey = substr($pubkey, strpos($pubkey, ',') + 1);
 					else
 						$pubkey = substr($pubkey, 5);
-				} elseif (normalise_link($pubkey) == 'http://')
-					$pubkey = fetch_url($pubkey);
+				} elseif (normalise_link($pubkey) == 'http://') {
+					$ret = z_fetch_url($pubkey);
+					if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+						return false;
+					}
+					$pubkey = $ret['body'];
+				}
 
 				$key = explode(".", $pubkey);
 
@@ -868,7 +908,11 @@ class Probe {
 			return false;
 
 		// Fetch all additional data from the feed
-		$feed = fetch_url($data["poll"]);
+		$ret = z_fetch_url($data["poll"]);
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			return false;
+		}
+		$feed = $ret['body'];
 		$feed_data = feed_import($feed,$dummy1,$dummy2, $dummy3, true);
 		if (!$feed_data)
 			return false;
@@ -1023,7 +1067,11 @@ class Probe {
 	 * @return array feed data
 	 */
 	private function feed($url, $probe = true) {
-		$feed = fetch_url($url);
+		$ret = z_fetch_url($url);
+		if ($ret['errno'] == CURLE_OPERATION_TIMEDOUT) {
+			return false;
+		}
+		$feed = $ret['body'];
 		$feed_data = feed_import($feed, $dummy1, $dummy2, $dummy3, true);
 
 		if (!$feed_data) {
@@ -1080,7 +1128,7 @@ class Probe {
 
 		$r = q("SELECT * FROM `mailacct` WHERE `uid` = %d AND `server` != '' LIMIT 1", intval($uid));
 
-		if(count($x) && count($r)) {
+		if (dbm::is_result($x) && dbm::is_result($r)) {
 			$mailbox = construct_mailbox_name($r[0]);
 			$password = '';
 			openssl_private_decrypt(hex2bin($r[0]['pass']), $password,$x[0]['prvkey']);