diff options
| author | Mario <mario@mariovavti.com> | 2020-04-16 12:33:02 +0200 |
|---|---|---|
| committer | Mario <mario@mariovavti.com> | 2020-04-16 12:33:02 +0200 |
| commit | f7e925beaad5b42e659977e33f2473ce9aa0bbac (patch) | |
| tree | f7b6fcbd3bcdbf9580bd60a0d3648374cc651b46 | |
| parent | e588ea8a8b697605c40a13210ab2b4c485d45ade (diff) | |
| download | volse-hubzilla-f7e925beaad5b42e659977e33f2473ce9aa0bbac.tar.gz volse-hubzilla-f7e925beaad5b42e659977e33f2473ce9aa0bbac.tar.bz2 volse-hubzilla-f7e925beaad5b42e659977e33f2473ce9aa0bbac.zip | |
Revert "keychange and request packets via zot6"
This reverts commit 9d0f71bfcbc0d1080a9f93590118046d326cae70
| -rw-r--r-- | Zotlabs/Daemon/Notifier.php | 14 |
1 files changed, 6 insertions, 8 deletions
diff --git a/Zotlabs/Daemon/Notifier.php b/Zotlabs/Daemon/Notifier.php index d3b0a6b14..d66079216 100644 --- a/Zotlabs/Daemon/Notifier.php +++ b/Zotlabs/Daemon/Notifier.php @@ -672,17 +672,15 @@ class Notifier { $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); } } - if($packet_type === 'keychange' && $hub['hubloc_network'] === 'zot6') { + if($packet_type === 'keychange' && $hub['hubloc_network'] === 'zot') { $pmsg = get_pconfig($channel['channel_id'],'system','keychange'); - $packet = Libzot::build_packet($channel, $packet_type, (($packet_recips) ? $packet_recips : null)); - // $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); - + $packet = zot_build_packet($channel,$packet_type,(($packet_recips) ? $packet_recips : null)); } - elseif($packet_type === 'request' && $hub['hubloc_network'] === 'zot6') { + elseif($packet_type === 'request' && $hub['hubloc_network'] === 'zot') { $env = (($hub_env && $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']]) ? $hub_env[$hub['hubloc_host'] . $hub['hubloc_sitekey']] : ''); - $packet = Libzot::build_packet($channel, $packet_type, $env, ['message_id' => $request_message_id], 'activitystreams', $hub['hubloc_sitekey'], $hub['site_crypto']); - // $packet = zot_build_packet($channel,$packet_type,$env,$hub['hubloc_sitekey'],$hub['site_crypto'],$hash, array('message_id' => $request_message_id)); - + $packet = zot_build_packet($channel,$packet_type,$env,$hub['hubloc_sitekey'],$hub['site_crypto'], + $hash, array('message_id' => $request_message_id) + ); } if($packet) { |