X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=49384efea76d80009e6036a48669d625bc896ee6;hb=fa1f2ce8f38962b97c4a6a327c5f50e238eabb9b;hp=a12b7391e06cdf7a59273d2db18d5cd144bfe6e3;hpb=72fd6eec4b3722aa8cb44f76dae9b8737f732287;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index a12b7391e0..49384efea7 100644
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -178,11 +178,13 @@ EOT;
 	));
 
 	$a = get_app();
-	$return_code = trim($a->get_curl_code());
+	$return_code = $a->get_curl_code();
 
 	// check for success, e.g. 2xx
 
-	if(substr($return_code,0,1) !== '2') {
+	if($return_code > 299) {
+
+		logger('slapper: compliant salmon failed. Falling back to status.net hack');
 
 		// Entirely likely that their salmon implementation is
 		// non-compliant. Let's try once more, this time only signing
@@ -201,10 +203,12 @@ EOT;
 			'Content-type: application/magic-envelope+xml',
 			'Content-length: ' . strlen($salmon)
 		));
-		$return_code = trim($a->get_curl_code());
+		$return_code = $a->get_curl_code();
 
 	}
 	logger('slapper returned ' . $return_code); 
-	return;
+	if(! $return_code)
+		return(-1);
+	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }