harukin/core
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

regression: mail from dev to core not delivering

Browse Source
This commit is contained in:
zotlabs 2018-12-17 18:14:32 -08:00
parent a33ed05bec
commit 8d70b91955
2 changed files with 8 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Zotlabs/Daemon/Notifier.php
View File

@ -625,7 +625,12 @@ class Notifier {
continue; continue;
} }
$hash = new_uuid(); // Do not change this to a uuid as long as we have traditional zot servers
// in the loop. The signature verification step can't handle dashes in the
// hashes.
$hash = random_string(48);
$packet = null; $packet = null;
$pmsg = ''; $pmsg = '';

2
include/zot.php
View File

@ -1232,6 +1232,7 @@ function zot_fetch($arr) {
$datatosend = json_encode(crypto_encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm)); $datatosend = json_encode(crypto_encapsulate(json_encode($data),$hub['hubloc_sitekey'], $algorithm));
$import = zot_zot($url,$datatosend); $import = zot_zot($url,$datatosend);
} }
else { else {
$algorithm = zot_best_algorithm($hub['site_crypto']); $algorithm = zot_best_algorithm($hub['site_crypto']);
@ -4913,6 +4914,7 @@ function zot_reply_pickup($data) {
dbesc($data['secret']), dbesc($data['secret']),
dbesc($data['callback']) dbesc($data['callback'])
); );
if(! $r) { if(! $r) {
$ret['message'] = 'nothing to pick up'; $ret['message'] = 'nothing to pick up';
logger('mod_zot: pickup: ' . $ret['message']); logger('mod_zot: pickup: ' . $ret['message']);