X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=7574374907eabf3f4cca2789b5be712dfebadee5;hb=bc92b922b45eb8da9d03f4a4d276a0ef706cf3e8;hp=ed4ed7ad6280f789588fea63a6ba5b53c65cdf47;hpb=e66489d67ffd10c2c47a82308b2f34da2d362684;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index ed4ed7ad62..7574374907 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -7,7 +7,7 @@ require_once('include/crypto.php');
 function get_salmon_key($uri,$keyhash) {
 	$ret = array();
 
-	logger('Fetching salmon key');
+	logger('Fetching salmon key for '.$uri);
 
 	$arr = lrdd($uri);
 
@@ -44,10 +44,10 @@ function get_salmon_key($uri,$keyhash) {
 	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 
+		// If it's the wrong key we'll find out soon enough because
+		// message verification will fail. This also covers some older
 		// software which don't supply a keyhash. As long as they only
-		// have one key we'll be right. 
+		// have one key we'll be right.
 
 		return $ret[0];
 	}
@@ -66,7 +66,7 @@ function get_salmon_key($uri,$keyhash) {
 
 function slapper($owner,$url,$slap) {
 
-	logger('slapper called for '.$owner['url'].' to '.$url.' . Data: ' . $slap);
+	logger('slapper called for '.$url.'. Data: ' . $slap);
 
 	// does contact have a salmon endpoint?
 
@@ -75,7 +75,7 @@ function slapper($owner,$url,$slap) {
 
 
 	if(! $owner['sprvkey']) {
-		logger(sprintf("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+		logger(sprintf("user '%s' (%d) does not have a salmon private key. Send failed.",
 		$owner['username'],$owner['uid']));
 		return;
 	}
@@ -87,11 +87,11 @@ $namespaces = <<< EOT
       xmlns:thr="http://purl.org/syndication/thread/1.0"
       xmlns:at="http://purl.org/atompub/tombstones/1.0"
       xmlns:media="http://purl.org/syndication/atommedia"
-      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0"
+      xmlns:dfrn="http://purl.org/macgirvin/dfrn/1.0" 
       xmlns:as="http://activitystrea.ms/spec/1.0/"
-      xmlns:georss="http://www.georss.org/georss"
-      xmlns:poco="http://portablecontacts.net/spec/1.0"
-      xmlns:ostatus="http://ostatus.org/schema/1.0"
+      xmlns:georss="http://www.georss.org/georss" 
+      xmlns:poco="http://portablecontacts.net/spec/1.0" 
+      xmlns:ostatus="http://ostatus.org/schema/1.0" 
 	  xmlns:statusnet="http://status.net/schema/api/1/" >													>
 EOT;
 
@@ -138,7 +138,7 @@ EOT;
 
 	if($return_code > 299) {
 
-		logger('slapper: compliant salmon failed. Falling back to status.net hack2');
+		logger('compliant salmon failed. Falling back to status.net hack2');
 
 		// Entirely likely that their salmon implementation is
 		// non-compliant. Let's try once more, this time only signing
@@ -162,7 +162,7 @@ EOT;
 
 		if($return_code > 299) {
 
-			logger('slapper: compliant salmon failed. Falling back to status.net hack3');
+			logger('compliant salmon failed. Falling back to status.net hack3');
 
 			// Entirely likely that their salmon implementation is
 			// non-compliant. Let's try once more, this time only signing
@@ -184,7 +184,7 @@ EOT;
 			$return_code = $a->get_curl_code();
 		}
 	}
-	logger('slapper returned ' . $return_code);
+	logger('slapper for '.$url.' returned ' . $return_code);
 	if(! $return_code)
 		return(-1);
 	if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))