work in progress js_uploader plugin, turn java uploader into plugin - not done yet

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 2838f2cbbf81afcd27168410c64bd5dcb18579a1..49384efea76d80009e6036a48669d625bc896ee6 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -19,10 +19,35 @@ function salmon_key($pubkey) {
 
 
 function base64url_encode($s) {
-       return strtr(base64_encode($s),'+/','-_');
+       $s = strtr(base64_encode($s),'+/','-_');
+/*
+ *  // placeholder for un-padded base64url_encode 
+ *  // per latest salmon rev
+ *
+ *  $s = str_replace('=','',$s);
+ *
+ */
+       return $s;
 }
 
 function base64url_decode($s) {
+
+/*
+ *  // Placeholder for new rev of salmon which strips base64 padding.
+ *  // PHP base64_decode handles the un-padded input without requiring this step
+ *  // Uncomment if you find you need it.
+ *
+ *     $l = strlen($s);
+ *     if(! strpos($s,'=')) {
+ *             $m = $l % 4;
+ *             if($m == 2)
+ *                     $s .= '==';
+ *             if($m == 3)
+ *                     $s .= '=';
+ *     }
+ *
+ */
+
        return base64_decode(strtr($s,'-_','+/'));
 }
 
@@ -153,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
@@ -176,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);
 }