X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2FScrape.php;h=6ee3dabfca88c11c42576e2a5c75c5194a96283e;hb=143e1a4a836e1fe4d05ab5d1c6008aa0198d2db5;hp=64a930bfdaedebfccbf46acb9f37a03085174cbe;hpb=602821279a504752f15829afbe7eca848352d0c8;p=friendica.git

diff --git a/include/Scrape.php b/include/Scrape.php
index 64a930bfda..6ee3dabfca 100644
--- a/include/Scrape.php
+++ b/include/Scrape.php
@@ -17,10 +17,12 @@ function scrape_dfrn($url, $dont_probe = false) {
 	if(! $s)
 		return $ret;
 
-	$probe = probe_url($url);
+	if (!$dont_probe) {
+		$probe = probe_url($url);
 
-	if (isset($probe["addr"]))
-		$ret["addr"] = $probe["addr"];
+		if (isset($probe["addr"]))
+			$ret["addr"] = $probe["addr"];
+	}
 
 	$headers = $a->get_curl_headers();
 	logger('scrape_dfrn: headers=' . $headers, LOGGER_DEBUG);
@@ -724,6 +726,45 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 				}
 			}
 
+			// Workaround for misconfigured Friendica servers
+			if (($network == "") AND (strstr($url, "/profile/"))) {
+				$noscrape = str_replace("/profile/", "/noscrape/", $url);
+				$noscrapejson = fetch_url($noscrape);
+				if ($noscrapejson) {
+
+					$network = NETWORK_DFRN;
+
+					$poco = str_replace("/profile/", "/poco/", $url);
+
+					$noscrapedata = json_decode($noscrapejson, true);
+
+					if (isset($noscrapedata["addr"]))
+						$addr = $noscrapedata["addr"];
+
+					if (isset($noscrapedata["fn"]))
+						$vcard["fn"] = $noscrapedata["fn"];
+
+					if (isset($noscrapedata["key"]))
+						$pubkey = $noscrapedata["key"];
+
+					if (isset($noscrapedata["photo"]))
+						$vcard["photo"] = $noscrapedata["photo"];
+
+					if (isset($noscrapedata["dfrn-request"]))
+						$request = $noscrapedata["dfrn-request"];
+
+					if (isset($noscrapedata["dfrn-confirm"]))
+						$confirm = $noscrapedata["dfrn-confirm"];
+
+					if (isset($noscrapedata["dfrn-notify"]))
+						$notify = $noscrapedata["dfrn-notify"];
+
+					if (isset($noscrapedata["dfrn-poll"]))
+						$poll = $noscrapedata["dfrn-poll"];
+
+				}
+			}
+
 			if((! $vcard['photo']) && strlen($email))
 				$vcard['photo'] = avatar_img($email);
 			if($poll === $profile)
@@ -829,7 +870,7 @@ function probe_url($url, $mode = PROBE_NORMAL, $level = 1) {
 	}
 
 	// Only store into the cache if the value seems to be valid
-	if ($result['network'] != NETWORK_FEED)
+	if ($result['network'] != NETWORK_PHANTOM)
 		Cache::set("probe_url:".$mode.":".$url,serialize($result), CACHE_DAY);
 
 	return $result;