aboutsummaryrefslogtreecommitdiffstats
path: root/include/zot.php
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-22 02:32:04 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-22 02:32:04 -0700
commit0b1b11ea53ee3fd466eb338ac5ce67e62af87413 (patch)
tree7bdda0d64e1bf27f860af620dcab160c470664cc /include/zot.php
parent146ff6f70308647b27374a1bba386c156498bd2e (diff)
downloadvolse-hubzilla-0b1b11ea53ee3fd466eb338ac5ce67e62af87413.tar.gz
volse-hubzilla-0b1b11ea53ee3fd466eb338ac5ce67e62af87413.tar.bz2
volse-hubzilla-0b1b11ea53ee3fd466eb338ac5ce67e62af87413.zip
heavy lifting for delivery reports
Diffstat (limited to 'include/zot.php')
-rw-r--r--include/zot.php12
1 files changed, 11 insertions, 1 deletions
diff --git a/include/zot.php b/include/zot.php
index f728d8fb9..942998b98 100644
--- a/include/zot.php
+++ b/include/zot.php
@@ -971,7 +971,11 @@ function zot_process_response($hub, $arr, $outq) {
}
}
}
-
+
+ q("delete from dreport where dreport_queue = '%s' limit 1",
+ dbesc($outq['outq_hash'])
+ );
+
// update the timestamp for this site
q("update site set site_dead = 0, site_update = '%s' where site_url = '%s'",
@@ -1575,6 +1579,12 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
continue;
}
+ if($d['hash'] === $sender['hash']) {
+ $DR->update('self delivery ignored');
+ $result[] = $DR->get();
+ continue;
+ }
+
$channel = $r[0];
$DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');