X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=5e9c4fa616dc1df20eec3c8d16ac372add35155e;hb=645fd414d5c5b8f4aa7214e413e77b7e34b1d54d;hp=a254fe7e97086953d4a8b1c607ad0e1feefd6b39;hpb=e44b831a2196717cae7e31c9fcbe42baf63541f4;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index a254fe7e97..5e9c4fa616 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,15 +1,14 @@
 <?php
 
 require_once('include/crypto.php');
-
-
+require_once('include/Probe.php');
 
 function get_salmon_key($uri,$keyhash) {
 	$ret = array();
 
 	logger('Fetching salmon key for '.$uri);
 
-	$arr = lrdd($uri);
+	$arr = Probe::lrdd($uri);
 
 	if(is_array($arr)) {
 		foreach($arr as $a) {
@@ -32,8 +31,7 @@ function get_salmon_key($uri,$keyhash) {
 					$ret[$x] = substr($ret[$x],strpos($ret[$x],',')+1);
 				else
 					$ret[$x] = substr($ret[$x],5);
-			}
-			else
+			} elseif (normalise_link($ret[$x]) == 'http://')
 				$ret[$x] = fetch_url($ret[$x]);
 		}
 	}
@@ -78,23 +76,6 @@ function slapper($owner,$url,$slap) {
 		return;
 	}
 
-	// add all namespaces to item
-
-$namespaces = <<< EOT
-<entry xmlns="http://www.w3.org/2005/Atom"
-      xmlns:thr="http://purl.org/syndication/thread/1.0"
-      xmlns:at="http://purl.org/atompub/tombstones/1.0"
-      xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
-      xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss" 
-      xmlns:poco="http://portablecontacts.net/spec/1.0" 
-      xmlns:ostatus="http://ostatus.org/schema/1.0" 
-	  xmlns:statusnet="http://status.net/schema/api/1/" >													>
-EOT;
-
-	$slap = str_replace('<entry>',$namespaces,$slap);
-
 	logger('slapper called for '.$url.'. Data: ' . $slap);
 
 	// create a magic envelope