X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=5d0b1bc3d0a12fc2badfb7661aa69542e4b98f5c;hb=f245bc83590879948d588fa9a2ac1ed50adefdb6;hp=6e08d0aaf2bac22516ef3dd38864665b144cb7f8;hpb=36e515ee6d00139a2aefed265ef38171c7c8e4fa;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index 6e08d0aaf2..5d0b1bc3d0 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -1,10 +1,14 @@
 <?php
-
+/**
+ * @file include/salmon.php
+ */
 use Friendica\Network\Probe;
+use Friendica\Util\Xml;
 
 require_once 'include/crypto.php';
 
-function get_salmon_key($uri, $keyhash) {
+function get_salmon_key($uri, $keyhash)
+{
 	$ret = array();
 
 	logger('Fetching salmon key for '.$uri);
@@ -42,7 +46,6 @@ function get_salmon_key($uri, $keyhash) {
 	logger('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.
 		// If it's the wrong key we'll find out soon enough because
 		// message verification will fail. This also covers some older
@@ -64,8 +67,8 @@ function get_salmon_key($uri, $keyhash) {
 
 
 
-function slapper($owner, $url, $slap) {
-
+function slapper($owner, $url, $slap)
+{
 	// does contact have a salmon endpoint?
 
 	if (! strlen($url)) {
@@ -109,7 +112,7 @@ function slapper($owner, $url, $slap) {
 
 	$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-	$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
+	$salmon = Xml::from_array($xmldata, $xml, false, $namespaces);
 
 	// slap them
 	post_url($url, $salmon, array(
@@ -123,7 +126,6 @@ function slapper($owner, $url, $slap) {
 	// check for success, e.g. 2xx
 
 	if ($return_code > 299) {
-
 		logger('GNU Social salmon failed. Falling back to compliant mode');
 
 		// Now try the compliant mode that normally isn't used for GNU Social
@@ -136,7 +138,7 @@ function slapper($owner, $url, $slap) {
 
 		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-		$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
+		$salmon = Xml::from_array($xmldata, $xml, false, $namespaces);
 
 		// slap them
 		post_url($url, $salmon, array(
@@ -159,7 +161,7 @@ function slapper($owner, $url, $slap) {
 
 		$namespaces = array("me" => "http://salmon-protocol.org/ns/magic-env");
 
-		$salmon = xml::from_array($xmldata, $xml, false, $namespaces);
+		$salmon = Xml::from_array($xmldata, $xml, false, $namespaces);
 
 		// slap them
 		post_url($url, $salmon, array(
@@ -170,11 +172,14 @@ function slapper($owner, $url, $slap) {
 	}
 
 	logger('slapper for '.$url.' returned ' . $return_code);
+
 	if (! $return_code) {
-		return(-1);
+		return -1;
 	}
+
 	if (($return_code == 503) && (stristr($a->get_curl_headers(), 'retry-after'))) {
-		return(-1);
+		return -1;
 	}
+
 	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }