diff options
| author | Mario Vavti <mario@mariovavti.com> | 2019-01-17 11:39:52 +0100 |
|---|---|---|
| committer | Mario Vavti <mario@mariovavti.com> | 2019-01-17 11:39:52 +0100 |
| commit | 07f6465872e807224e54e3d73f5296d0fa057ca2 (patch) | |
| tree | f3e3094dc7beb59f6db52c8f510de77581b334c9 /Zotlabs/Lib | |
| parent | eda7c5369c0228ed11ef3bddfa33d81b0c6a3747 (diff) | |
| download | volse-hubzilla-07f6465872e807224e54e3d73f5296d0fa057ca2.tar.gz volse-hubzilla-07f6465872e807224e54e3d73f5296d0fa057ca2.tar.bz2 volse-hubzilla-07f6465872e807224e54e3d73f5296d0fa057ca2.zip | |
fix delivery report for zot6 connections
Diffstat (limited to 'Zotlabs/Lib')
| -rw-r--r-- | Zotlabs/Lib/DReport.php | 6 | ||||
| -rw-r--r-- | Zotlabs/Lib/Libzot.php | 1 |
2 files changed, 6 insertions, 1 deletions
diff --git a/Zotlabs/Lib/DReport.php b/Zotlabs/Lib/DReport.php index ef1ce2678..1292e7488 100644 --- a/Zotlabs/Lib/DReport.php +++ b/Zotlabs/Lib/DReport.php @@ -87,9 +87,11 @@ class DReport { // Is the sender one of our channels? - $c = q("select channel_id from channel where channel_hash = '%s' limit 1", + $c = q("select channel_id from channel where channel_hash = '%s' or channel_portable_id = '%s'limit 1", + dbesc($dr['sender']), dbesc($dr['sender']) ); + if(! $c) return false; @@ -104,6 +106,8 @@ class DReport { $rxchan = $dr['recipient']; } + + // is the recipient one of our connections, or do we want to store every report? $pcf = get_pconfig($c[0]['channel_id'],'system','dreport_store_all'); diff --git a/Zotlabs/Lib/Libzot.php b/Zotlabs/Lib/Libzot.php index 268622430..e66c929bf 100644 --- a/Zotlabs/Lib/Libzot.php +++ b/Zotlabs/Lib/Libzot.php @@ -995,6 +995,7 @@ logger('4'); } if(is_array($x) && array_key_exists('delivery_report',$x) && is_array($x['delivery_report'])) { + foreach($x['delivery_report'] as $xx) { call_hooks('dreport_process',$xx); if(is_array($xx) && array_key_exists('message_id',$xx) && DReport::is_storable($xx)) { |