add trailing slash to diaspora notify url on send

diff --git a/boot.php b/boot.php
index 302844f57f79720655c96597667fd80893d193a1..ae3c04b77cd42499577aa701071fb9c448821b9e 100644 (file)
--- a/boot.php
+++ b/boot.php
@@ -7,7 +7,7 @@ require_once('include/text.php');
 require_once("include/pgettext.php");
 
 
-define ( 'FRIENDIKA_VERSION',      '2.2.1078' );
+define ( 'FRIENDIKA_VERSION',      '2.2.1079' );
 define ( 'DFRN_PROTOCOL_VERSION',  '2.21'    );
 define ( 'DB_UPDATE_VERSION',      1081      );
 

diff --git a/include/diaspora.php b/include/diaspora.php
index 9b9d2cf8df926c7bc313a55ccac6fd4d96211883..541172911408ecb0c9936ca974cf1770c6dab628 100644 (file)
--- a/include/diaspora.php
+++ b/include/diaspora.php
@@ -83,7 +83,9 @@ EOT;
        $b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle);
        $encrypted_header_json_object = json_encode(array('aes_key' => base64_encode($encrypted_outer_key_bundle), 
                'ciphertext' => base64_encode($ciphertext)));
-       $encrypted_header = '<encrypted_header>' . base64_encode($encrypted_header_json_object) . '</encrypted_header>';
+       $cipher_json = base64_encode($encrypted_header_json_object);
+
+       $encrypted_header = '<encrypted_header>' . $cipher_json . '</encrypted_header>';
 
 $magic_env = <<< EOT
 <?xml version='1.0' encoding='UTF-8'?>
@@ -798,7 +800,7 @@ function diaspora_share($me,$contact) {
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$me,$contact,$me['prvkey'],$contact['pubkey'])));
 
-       post_url($contact['notify'],$slap);
+       post_url($contact['notify'] . '/',$slap);
        $return_code = $a->get_curl_code();
        return $return_code;
 }
@@ -829,7 +831,7 @@ function diaspora_send_status($item,$owner,$contact) {
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
 
-       post_url($contact['notify'],$slap);
+       post_url($contact['notify'] . '/',$slap);
        $return_code = $a->get_curl_code();
        logger('diaspora_send_status: returns: ' . $return_code);
        return $return_code;
@@ -886,7 +888,7 @@ function diaspora_send_followup($item,$owner,$contact) {
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
 
-       post_url($contact['notify'],$slap);
+       post_url($contact['notify'] . '/',$slap);
        $return_code = $a->get_curl_code();
        logger('diaspora_send_status: returns: ' . $return_code);
        return $return_code;
@@ -962,7 +964,7 @@ function diaspora_send_relay($item,$owner,$contact) {
 
        $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'])));
 
-       post_url($contact['notify'],$slap);
+       post_url($contact['notify'] . '/',$slap);
        $return_code = $a->get_curl_code();
        logger('diaspora_send_status: returns: ' . $return_code);
        return $return_code;