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

Small fix for empty signatures

Browse source
This commit is contained in:
Michael Vogel 2016-01-21 13:57:21 +01:00
parent 54f42cb706
commit e00c091540
1 changed files with 5 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
include/diaspora.php
View file

@ -827,6 +827,10 @@ function diaspora_plink($addr, $guid) {
} }
function diaspora_repair_signature($signature, $handle = "", $level = 1) { function diaspora_repair_signature($signature, $handle = "", $level = 1) {
if ($signature == "")
return($signature);
if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) { if (base64_encode(base64_decode(base64_decode($signature))) == base64_decode($signature)) {
$signature = base64_decode($signature); $signature = base64_decode($signature);
logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG); logger("Repaired double encoded signature from Diaspora/Hubzilla handle ".$handle." - level ".$level, LOGGER_DEBUG);
@ -2974,7 +2978,7 @@ function diaspora_send_relay($item,$owner,$contact,$public_batch = false) {
'$handle' => xmlify($handle) '$handle' => xmlify($handle)
)); ));
logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DEBUG); logger('diaspora_send_relay: base message: ' . $msg, LOGGER_DATA);
logger('send guid '.$item['guid'], LOGGER_DEBUG); logger('send guid '.$item['guid'], LOGGER_DEBUG);
$slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch))); $slap = 'xml=' . urlencode(urlencode(diaspora_msg_build($msg,$owner,$contact,$owner['uprvkey'],$contact['pubkey'],$public_batch)));