modified: view/theme/smoothly/style.css

[friendica.git] / include / salmon.php

diff --git a/include/salmon.php b/include/salmon.php
index 4043b4f1d93f0c1f243b564e86b9cc1f0453c5c8..3d525f51ad36d0a2d55349937c140e404f8b56ea 100644 (file)
--- a/include/salmon.php
+++ b/include/salmon.php
@@ -73,6 +73,13 @@ function slapper($owner,$url,$slap) {
        if(! strlen($url))
                return;
 
+
+       if(! $owner['sprvkey']) {
+               logger(sprintf("slapper: user '%s' (%d) does not have a salmon private key. Send failed.",
+               $owner['username'],$owner['uid']));
+               return;
+       }
+
        // add all namespaces to item
 
 $namespaces = <<< EOT
@@ -102,11 +109,11 @@ EOT;
 
        $precomputed = '.YXBwbGljYXRpb24vYXRvbSt4bWw=.YmFzZTY0dXJs.UlNBLVNIQTI1Ng==';
 
-       $signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),true),$owner['sprvkey']);
+       $signature   = base64url_encode(rsa_sign(str_replace('=','',$data . $precomputed),$owner['sprvkey']));
 
-       $signature2  = base64url_encode(rsa_sign($data . $precomputed),$owner['sprvkey']);
+       $signature2  = base64url_encode(rsa_sign($data . $precomputed,$owner['sprvkey']));
 
-       $signature3  = base64url_encode(rsa_sign($data),$owner['sprvkey']);
+       $signature3  = base64url_encode(rsa_sign($data,$owner['sprvkey']));
 
        $salmon_tpl = get_markup_template('magicsig.tpl');
 
@@ -180,6 +187,9 @@ EOT;
        logger('slapper returned ' . $return_code); 
        if(! $return_code)
                return(-1);
+       if(($return_code == 503) && (stristr($a->get_curl_headers(),'retry-after')))
+               return(-1);
+
        return ((($return_code >= 200) && ($return_code < 300)) ? 0 : 1);
 }