X-Git-Url: https://git.mxchange.org/?a=blobdiff_plain;f=include%2Fsalmon.php;h=49384efea76d80009e6036a48669d625bc896ee6;hb=0b4a6f8eaca0d1396e7e944cd4735a573bd1d111;hp=85bda1c8f314afad412b2255ac8a61bf725b8edc;hpb=de6c777d3f6753b8fb5f33bc0ee8acafc6772551;p=friendica.git

diff --git a/include/salmon.php b/include/salmon.php
index 85bda1c8f3..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,12 +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); 
 	if(! $return_code)
 		return(-1);
-	return ((substr($return_code,0,1) === '2') ? 0 : 1);
+	return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }