X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=src%2FProtocol%2FSalmon.php;h=29abd77d06f607890fe040276d1cc896c14cfbf1;hb=14fde5dc9b1915392601fb94efc6224c01f2b216;hp=5b0c66fb9d13271fba3bc392d693e0912d92cd4f;hpb=e36f2bb1fb3439e9993c7568e57140c4f954b772;p=friendica.git

diff --git a/src/Protocol/Salmon.php b/src/Protocol/Salmon.php
index 5b0c66fb9d..29abd77d06 100644
--- a/src/Protocol/Salmon.php
+++ b/src/Protocol/Salmon.php
@@ -4,8 +4,10 @@
  */
 namespace Friendica\Protocol;
 
+use Friendica\Core\Logger;
 use Friendica\Network\Probe;
 use Friendica\Util\Crypto;
+use Friendica\Util\Network;
 use Friendica\Util\XML;
 
 /**
@@ -24,7 +26,7 @@ class Salmon
 	{
 		$ret = [];
 
-		logger('Fetching salmon key for '.$uri);
+		Logger::log('Fetching salmon key for '.$uri);
 
 		$arr = Probe::lrdd($uri);
 
@@ -50,13 +52,13 @@ class Salmon
 						$ret[$x] = substr($ret[$x], 5);
 					}
 				} elseif (normalise_link($ret[$x]) == 'http://') {
-					$ret[$x] = fetch_url($ret[$x]);
+					$ret[$x] = Network::fetchUrl($ret[$x]);
 				}
 			}
 		}
 
 
-		logger('Key located: ' . print_r($ret, true));
+		Logger::log('Key located: ' . print_r($ret, true));
 
 		if (count($ret) == 1) {
 			// We only found one one key so we don't care if the hash matches.
@@ -93,12 +95,12 @@ class Salmon
 		}
 
 		if (! $owner['sprvkey']) {
-			logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
+			Logger::log(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
 			$owner['username'], $owner['uid']));
 			return;
 		}
 
-		logger('slapper called for '.$url.'. Data: ' . $slap);
+		Logger::log('slapper called for '.$url.'. Data: ' . $slap);
 
 		// create a magic envelope
 
@@ -132,18 +134,17 @@ class Salmon
 		$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 		// slap them
-		post_url($url, $salmon, [
+		$postResult = Network::post($url, $salmon, [
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
 		]);
 
-		$a = get_app();
-		$return_code = $a->get_curl_code();
+		$return_code = $postResult->getReturnCode();
 
 		// check for success, e.g. 2xx
 
 		if ($return_code > 299) {
-			logger('GNU Social salmon failed. Falling back to compliant mode');
+			Logger::log('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,
@@ -158,15 +159,15 @@ class Salmon
 			$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 			// slap them
-			post_url($url, $salmon, [
+			$postResult = Network::post($url, $salmon, [
 				'Content-type: application/magic-envelope+xml',
 				'Content-length: ' . strlen($salmon)
 			]);
-			$return_code = $a->get_curl_code();
+			$return_code = $postResult->getReturnCode();
 		}
 
 		if ($return_code > 299) {
-			logger('compliant salmon failed. Falling back to old status.net');
+			Logger::log('compliant salmon failed. Falling back to old status.net');
 
 			// Last try. This will most likely fail as well.
 			$xmldata = ["me:env" => ["me:data" => $data,
@@ -181,20 +182,19 @@ class Salmon
 			$salmon = XML::fromArray($xmldata, $xml, false, $namespaces);
 
 			// slap them
-			post_url($url, $salmon, [
+			$postResult = Network::post($url, $salmon, [
 				'Content-type: application/magic-envelope+xml',
-				'Content-length: ' . strlen($salmon)]
-			);
-			$return_code = $a->get_curl_code();
+				'Content-length: ' . strlen($salmon)]);
+			$return_code = $postResult->getReturnCode();
 		}
 
-		logger('slapper for '.$url.' returned ' . $return_code);
+		Logger::log('slapper for '.$url.' returned ' . $return_code);
 
 		if (! $return_code) {
 			return -1;
 		}
 
-		if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
+		if (($return_code == 503) && (stristr($postResult->getHeader(), 'retry-after'))) {
 			return -1;
 		}