X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FSalmon.php;h=aecc35e9f9372f34159f7899a320c87c05dc0a55;hb=41f502266e10dfa7f10a51bf47dcfb9a31ca9afc;hp=53367f6d092976eb632a5a644d51e57e57025747;hpb=2108be7e07792a069ef0650126ac22d470a4b7fc;p=friendica.git

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 53367f6d09..aecc35e9f9 100644
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -1,6 +1,6 @@
 <?php
 /**
- * @copyright Copyright (C) 2010-2021, the Friendica project
+ * @copyright Copyright (C) 2010-2022, the Friendica project
  *
  * @license GNU AGPL version 3 or any later version
  *
@@ -46,7 +46,7 @@ class Salmon
 	{
 		$ret = [];
 
-		Logger::log('Fetching salmon key for '.$uri);
+		Logger::info('Fetching salmon key for '.$uri);
 
 		$arr = Probe::lrdd($uri);
 
@@ -72,7 +72,7 @@ class Salmon
 						$ret[$x] = substr($ret[$x], 5);
 					}
 				} elseif (Strings::normaliseLink($ret[$x]) == 'http://') {
-					$ret[$x] = DI::httpRequest()->fetch($ret[$x]);
+					$ret[$x] = DI::httpClient()->fetch($ret[$x]);
 				}
 			}
 		}
@@ -116,12 +116,12 @@ class Salmon
 		}
 
 		if (!$owner['sprvkey']) {
-			Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+			Logger::notice(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
 			$owner['name'], $owner['uid']));
 			return;
 		}
 
-		Logger::log('slapper called for '.$url.'. Data: ' . $slap);
+		Logger::info('slapper called for '.$url.'. Data: ' . $slap);
 
 		// create a magic envelope
 
@@ -155,9 +155,9 @@ class Salmon
 		$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 		// slap them
-		$postResult = DI::httpRequest()->post($url, $salmon, [
-			'Content-type: application/magic-envelope+xml',
-			'Content-length: ' . strlen($salmon)
+		$postResult = DI::httpClient()->post($url, $salmon, [
+			'Content-type' => 'application/magic-envelope+xml',
+			'Content-length' => strlen($salmon),
 		]);
 
 		$return_code = $postResult->getReturnCode();
@@ -165,7 +165,7 @@ class Salmon
 		// check for success, e.g. 2xx
 
 		if ($return_code > 299) {
-			Logger::log('GNU Social salmon failed. Falling back to compliant mode');
+			Logger::notice('GNU Social salmon failed. Falling back to compliant mode');
 
 			// Now try the compliant mode that normally isn't used for GNU Social
 			$xmldata = ["me:env" => ["me:data" => $data,
@@ -180,15 +180,15 @@ class Salmon
 			$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 			// slap them
-			$postResult = DI::httpRequest()->post($url, $salmon, [
-				'Content-type: application/magic-envelope+xml',
-				'Content-length: ' . strlen($salmon)
+			$postResult = DI::httpClient()->post($url, $salmon, [
+				'Content-type' => 'application/magic-envelope+xml',
+				'Content-length' => strlen($salmon),
 			]);
 			$return_code = $postResult->getReturnCode();
 		}
 
 		if ($return_code > 299) {
-			Logger::log('compliant salmon failed. Falling back to old status.net');
+			Logger::notice('compliant salmon failed. Falling back to old status.net');
 
 			// Last try. This will most likely fail as well.
 			$xmldata = ["me:env" => ["me:data" => $data,
@@ -203,13 +203,13 @@ class Salmon
 			$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 			// slap them
-			$postResult = DI::httpRequest()->post($url, $salmon, [
-				'Content-type: application/magic-envelope+xml',
-				'Content-length: ' . strlen($salmon)]);
+			$postResult = DI::httpClient()->post($url, $salmon, [
+				'Content-type' => 'application/magic-envelope+xml',
+				'Content-length' => strlen($salmon)]);
 			$return_code = $postResult->getReturnCode();
 		}
 
-		Logger::log('slapper for '.$url.' returned ' . $return_code);
+		Logger::info('slapper for '.$url.' returned ' . $return_code);
 
 		if (! $return_code) {
 			return -1;