X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FNetwork%2FProbe.php;h=e44a8d326ecf92bd16d1da9bdfb5fd2b0d756029;hb=09aa496387ae732a2a27ab8d963f2e24192082cd;hp=3fe035286f3bed729a11b947d06ac3eb551d063b;hpb=fb7f7435c080e15bdafbbcbb5a3dfd94ef8dd952;p=friendica.git

diff --git a/src/Network/Probe.php b/src/Network/Probe.php
index 3fe035286f..e44a8d326e 100644
--- a/src/Network/Probe.php
+++ b/src/Network/Probe.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2020, Friendica
+ * @copyright Copyright (C) 2010-2021, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -87,8 +87,8 @@ class Probe
 	 */
 	private static function rearrangeData($data)
 	{
-		$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "account-type",
-				"community", "keywords", "location", "about", "hide",
+		$fields = ["name", "nick", "guid", "url", "addr", "alias", "photo", "header",
+				"account-type", "community", "keywords", "location", "about", "hide",
 				"batch", "notify", "poll", "request", "confirm", "subscribe", "poco",
 				"following", "followers", "inbox", "outbox", "sharedinbox",
 				"priority", "network", "pubkey", "manually-approve", "baseurl", "gsid"];
@@ -169,7 +169,7 @@ class Probe
 		Logger::info('Probing', ['host' => $host, 'ssl_url' => $ssl_url, 'url' => $url, 'callstack' => System::callstack(20)]);
 		$xrd = null;
 
-		$curlResult = DI::httpRequest()->get($ssl_url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+		$curlResult = DI::httpRequest()->get($ssl_url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 		$ssl_connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 		if ($curlResult->isSuccess()) {
 			$xml = $curlResult->getBody();
@@ -186,7 +186,7 @@ class Probe
 		}
 
 		if (!is_object($xrd) && !empty($url)) {
-			$curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
+			$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => 'application/xrd+xml']);
 			$connection_error = ($curlResult->getErrorNumber() == CURLE_COULDNT_CONNECT) || ($curlResult->getReturnCode() == 0);
 			if ($curlResult->isTimeout()) {
 				Logger::info('Probing timeout', ['url' => $url]);
@@ -258,7 +258,7 @@ class Probe
 	 * @return string profile link
 	 * @throws HTTPException\InternalServerErrorException
 	 */
-	public static function webfingerDfrn($webbie, &$hcard_url)
+	public static function webfingerDfrn(string $webbie, string &$hcard_url)
 	{
 		$profile_link = '';
 
@@ -439,6 +439,9 @@ class Probe
 		}
 
 		$body = $curlResult->getBody();
+		if (empty($body)) {
+			return false;
+		}
 
 		$doc = new DOMDocument();
 		@$doc->loadHTML($body);
@@ -941,7 +944,7 @@ class Probe
 	{
 		$xrd_timeout = DI::config()->get('system', 'xrd_timeout', 20);
 
-		$curlResult = DI::httpRequest()->get($url, false, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
+		$curlResult = DI::httpRequest()->get($url, ['timeout' => $xrd_timeout, 'accept_content' => $type]);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
 			return [];
@@ -1013,18 +1016,18 @@ class Probe
 		$curlResult = DI::httpRequest()->get($noscrape_url);
 		if ($curlResult->isTimeout()) {
 			self::$istimeout = true;
-			return [];
+			return $data;
 		}
 		$content = $curlResult->getBody();
 		if (!$content) {
 			Logger::info('Empty body', ['url' => $noscrape_url]);
-			return [];
+			return $data;
 		}
 
 		$json = json_decode($content, true);
 		if (!is_array($json)) {
 			Logger::info('No json data', ['url' => $noscrape_url]);
-			return [];
+			return $data;
 		}
 
 		if (!empty($json["fn"])) {
@@ -1274,7 +1277,7 @@ class Probe
 			return [];
 		}
 		$content = $curlResult->getBody();
-		if (!$content) {
+		if (empty($content)) {
 			return [];
 		}
 
@@ -1610,7 +1613,7 @@ class Probe
 	private static function pumpioProfileData($profile_link)
 	{
 		$curlResult = DI::httpRequest()->get($profile_link);
-		if (!$curlResult->isSuccess()) {
+		if (!$curlResult->isSuccess() || empty($curlResult->getBody())) {
 			return [];
 		}
 
@@ -1754,6 +1757,10 @@ class Probe
 	 */
 	public static function getFeedLink(string $url, string $body)
 	{
+		if (empty($body)) {
+			return '';
+		}
+
 		$doc = new DOMDocument();
 		if (!@$doc->loadHTML($body)) {
 			return false;
@@ -1801,26 +1808,28 @@ class Probe
 
 		$hrefParts = parse_url($href);
 
-		// Root path case (/path) including relative scheme case (//host/path)
-		if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
-			$path = $hrefParts['path'];
-		} else {
-			$path = $path . '/' . $hrefParts['path'];
-
-			// Resolve arbitrary relative path
-			// Lifted from https://www.php.net/manual/en/function.realpath.php#84012
-			$parts = array_filter(explode('/', $path), 'strlen');
-			$absolutes = array();
-			foreach ($parts as $part) {
-				if ('.' == $part) continue;
-				if ('..' == $part) {
-					array_pop($absolutes);
-				} else {
-					$absolutes[] = $part;
+		if (!empty($hrefParts['path'])) {
+			// Root path case (/path) including relative scheme case (//host/path)
+			if ($hrefParts['path'] && $hrefParts['path'][0] == '/') {
+				$path = $hrefParts['path'];
+			} else {
+				$path = $path . '/' . $hrefParts['path'];
+
+				// Resolve arbitrary relative path
+				// Lifted from https://www.php.net/manual/en/function.realpath.php#84012
+				$parts = array_filter(explode('/', $path), 'strlen');
+				$absolutes = array();
+				foreach ($parts as $part) {
+					if ('.' == $part) continue;
+					if ('..' == $part) {
+						array_pop($absolutes);
+					} else {
+						$absolutes[] = $part;
+					}
 				}
-			}
 
-			$path = '/' . implode('/', $absolutes);
+				$path = '/' . implode('/', $absolutes);
+			}
 		}
 
 		// Relative scheme case (//host/path)
@@ -2213,8 +2222,9 @@ class Probe
 
 		$data = ['name' => $profile['name'], 'nick' => $profile['nick'], 'guid' => $approfile['diaspora:guid'] ?? '',
 			'url' => $profile['url'], 'addr' => $profile['addr'], 'alias' => $profile['alias'],
-			'photo' => $profile['photo'], 'account-type' => $profile['contact-type'],
-			'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
+			'photo' => Contact::getAvatarUrlForId($profile['id'], $profile['updated']),
+			'header' => $profile['header'] ? Contact::getHeaderUrlForId($profile['id'], $profile['updated']) : '',
+			'account-type' => $profile['contact-type'], 'community' => ($profile['contact-type'] == User::ACCOUNT_TYPE_COMMUNITY),
 			'keywords' => $profile['keywords'], 'location' => $profile['location'], 'about' => $profile['about'], 
 			'hide' => !$profile['net-publish'], 'batch' => '', 'notify' => $profile['notify'],
 			'poll' => $profile['poll'], 'request' => $profile['request'], 'confirm' => $profile['confirm'],