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;
$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.
{
// 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;
}
$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)
]);
$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)
]);
$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();