diff options
| author | nobody <nobody@zotlabs.com> | 2021-02-18 21:42:15 -0800 |
|---|---|---|
| committer | nobody <nobody@zotlabs.com> | 2021-02-18 21:42:15 -0800 |
| commit | 5664f5e0a2042287e81564d85816fdce6f1614a2 (patch) | |
| tree | ead6d70c6fb6ca1aada92eea2f3c723456cf5f8c /include/zot.php | |
| parent | 136bc13ff6081a17782ef757c2e979e16333d663 (diff) | |
| parent | d50381c9c67e097cf3eae73f0311191acca8f0a5 (diff) | |
| download | volse-hubzilla-5664f5e0a2042287e81564d85816fdce6f1614a2.tar.gz volse-hubzilla-5664f5e0a2042287e81564d85816fdce6f1614a2.tar.bz2 volse-hubzilla-5664f5e0a2042287e81564d85816fdce6f1614a2.zip | |
Merge branch 'dev' of https://framagit.org/hubzilla/core into dev
Diffstat (limited to 'include/zot.php')
| -rw-r--r-- | include/zot.php | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/include/zot.php b/include/zot.php index 84bf3f9b2..634561fa3 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1131,6 +1131,7 @@ function zot_process_response($hub, $arr, $outq) { if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) { if(array_key_exists('iv',$x['delivery_report'])) { + $x['delivery_report']['encrypted'] = true; $j = Crypto::unencapsulate($x['delivery_report'],get_config('system','prvkey')); if($j) { $x['delivery_report'] = json_decode($j,true); @@ -1317,6 +1318,7 @@ function zot_import($arr, $sender_url) { } if(array_key_exists('iv', $data)) { + $data['encrypted'] = true; $data = json_decode(Crypto::unencapsulate($data,get_config('system','prvkey')),true); } @@ -1345,6 +1347,7 @@ function zot_import($arr, $sender_url) { $result = null; if(array_key_exists('iv',$i['notify'])) { + $i['notify']['encrypted'] = true; $i['notify'] = json_decode(Crypto::unencapsulate($i['notify'],get_config('system','prvkey')),true); } |