Merge branch 'master' of git://github.com/friendika/friendika

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 85bda1c8f314afad412b2255ac8a61bf725b8edc..8a56882adb6f16ef6671b8b431cb38428e482c91 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -18,15 +18,13 @@ function salmon_key($pubkey) {
 }
 
 
-function base64url_encode($s) {
+function base64url_encode($s, $strip_padding = false) {
+
        $s = strtr(base64_encode($s),'+/','-_');
-/*
- *  // placeholder for un-padded base64url_encode 
- *  // per latest salmon rev
- *
- *  $s = str_replace('=','',$s);
- *
- */
+
+       if($strip_padding)
+               $s = str_replace('=','',$s);
+
        return $s;
 }
 
@@ -178,11 +176,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 +201,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);
 }