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

delivery report decryption is not needed for local delivery

Browse Source
This commit is contained in:
zotlabs 2017-09-21 23:51:04 -07:00
parent 3456c192fe
commit aef239f421
1 changed files with 14 additions and 19 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

33
Zotlabs/Daemon/Deliver.php
View File

@ -54,29 +54,24 @@ class Deliver {
if($dresult && is_array($dresult)) { if($dresult && is_array($dresult)) {
if(array_key_exists('iv',$dresult)) { // delivery reports for local deliveries do not require encryption
$dresult = json_decode(crypto_unencapsulate($dresult,get_config('system','prvkey')),true);
} foreach($dresult as $xx) {
if(! $dresult) { if(is_array($xx) && array_key_exists('message_id',$xx)) {
logger('dreport decryption failure'); if(delivery_report_is_storable($xx)) {
} q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ",
else { dbesc($xx['message_id']),
foreach($dresult as $xx) { dbesc($xx['location']),
if(is_array($xx) && array_key_exists('message_id',$xx)) { dbesc($xx['recipient']),
if(delivery_report_is_storable($xx)) { dbesc($xx['status']),
q("insert into dreport ( dreport_mid, dreport_site, dreport_recip, dreport_result, dreport_time, dreport_xchan ) values ( '%s', '%s','%s','%s','%s','%s' ) ", dbesc(datetime_convert($xx['date'])),
dbesc($xx['message_id']), dbesc($xx['sender'])
dbesc($xx['location']), );
dbesc($xx['recipient']),
dbesc($xx['status']),
dbesc(datetime_convert($xx['date'])),
dbesc($xx['sender'])
);
}
} }
} }
} }
} }
q("delete from dreport where dreport_queue = '%s'", q("delete from dreport where dreport_queue = '%s'",
dbesc($argv[$x]) dbesc($argv[$x])
); );