Merge pull request #8957 from annando/server-peers

[friendica.git] / src / Protocol / Salmon.php

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 0d234b53f0151340494bfede168276e4382dcbd9..88c342a87cdaa7d19f13eeba80504acd7d5e5423 100644 (file)
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -22,9 +22,9 @@
 namespace Friendica\Protocol;
 
 use Friendica\Core\Logger;
+use Friendica\DI;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
-use Friendica\Util\Network;
 use Friendica\Util\Strings;
 use Friendica\Util\XML;
 
@@ -72,13 +72,13 @@ class Salmon
                                                $ret[$x] = substr($ret[$x], 5);
                                        }
                                } elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
-                                       $ret[$x] = Network::fetchUrl($ret[$x]);
+                                       $ret[$x] = DI::httpRequest()->fetch($ret[$x]);
                                }
                        }
                }
 
 
-               Logger::log('Key located: ' . print_r($ret, true));
+               Logger::notice('Key located', ['ret' => $ret]);
 
                if (count($ret) == 1) {
                        // We only found one one key so we don't care if the hash matches.
@@ -111,13 +111,13 @@ class Salmon
        {
                // does contact have a salmon endpoint?
 
-               if (! strlen($url)) {
+               if (!strlen($url)) {
                        return;
                }
 
-               if (! $owner['sprvkey']) {
+               if (!$owner['sprvkey']) {
                        Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
-                       $owner['username'], $owner['uid']));
+                       $owner['name'], $owner['uid']));
                        return;
                }
 
@@ -155,7 +155,7 @@ class Salmon
                $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                // slap them
-               $postResult = Network::post($url, $salmon, [
+               $postResult = DI::httpRequest()->post($url, $salmon, [
                        'Content-type: application/magic-envelope+xml',
                        'Content-length: ' . strlen($salmon)
                ]);
@@ -180,7 +180,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = Network::post($url, $salmon, [
+                       $postResult = DI::httpRequest()->post($url, $salmon, [
                                'Content-type: application/magic-envelope+xml',
                                'Content-length: ' . strlen($salmon)
                        ]);
@@ -203,7 +203,7 @@ class Salmon
                        $salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
                        // slap them
-                       $postResult = Network::post($url, $salmon, [
+                       $postResult = DI::httpRequest()->post($url, $salmon, [
                                'Content-type: application/magic-envelope+xml',
                                'Content-length: ' . strlen($salmon)]);
                        $return_code = $postResult->getReturnCode();