Merge branch 'develop' into rewrites/dbm_is_result

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index a254fe7e97086953d4a8b1c607ad0e1feefd6b39..c5c3d722371c9066ae0e7bcee1e76849008f3ed0 100644 (file)
--- 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) {
@@ -25,15 +24,14 @@ function get_salmon_key($uri,$keyhash) {
        // We have found at least one key URL
        // If it's inline, parse it - otherwise get the key
 
-       if(count($ret)) {
+       if(count($ret) > 0) {
                for($x = 0; $x < count($ret); $x ++) {
                        if(substr($ret[$x],0,5) === 'data:') {
                                if(strstr($ret[$x],','))
                                        $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