nupplaPhil/friendica
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

add trailing slash to diaspora notify url on send

Browse source
This commit is contained in:
Friendika 2011-08-21 17:24:50 -07:00
parent e3eb4c131f
commit 213f832443
2 changed files with 8 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
boot.php
View file

@ -7,7 +7,7 @@ require_once('include/text.php');
require_once("include/pgettext.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 ( 'DFRN_PROTOCOL_VERSION', '2.21' );
define ( 'DB_UPDATE_VERSION', 1081 ); define ( 'DB_UPDATE_VERSION', 1081 );

12
include/diaspora.php
View file

@ -83,7 +83,9 @@ EOT;
$b64_encrypted_outer_key_bundle = base64_encode($encrypted_outer_key_bundle); $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), $encrypted_header_json_object = json_encode(array('aes_key' => base64_encode($encrypted_outer_key_bundle),
'ciphertext' => base64_encode($ciphertext))); '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 $magic_env = <<< EOT
<?xml version='1.0' encoding='UTF-8'?> <?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']))); $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_code = $a->get_curl_code();
return $return_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']))); $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(); $return_code = $a->get_curl_code();
logger('diaspora_send_status: returns: ' . $return_code); logger('diaspora_send_status: returns: ' . $return_code);
return $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']))); $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(); $return_code = $a->get_curl_code();
logger('diaspora_send_status: returns: ' . $return_code); logger('diaspora_send_status: returns: ' . $return_code);
return $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']))); $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(); $return_code = $a->get_curl_code();
logger('diaspora_send_status: returns: ' . $return_code); logger('diaspora_send_status: returns: ' . $return_code);
return $return_code; return $return_code;