diff options
| author | redmatrix <redmatrix@redmatrix.me> | 2015-09-22 04:04:51 -0700 |
|---|---|---|
| committer | redmatrix <redmatrix@redmatrix.me> | 2015-09-22 04:04:51 -0700 |
| commit | 2869ccfe39cbda4974a82c303eeeb4e38966b126 (patch) | |
| tree | 0038f63f531f8121e67a3931f19dfda019ab6044 /include | |
| parent | 8ead4745f82d113c943f79967e04ea985ec45ad0 (diff) | |
| download | volse-hubzilla-2869ccfe39cbda4974a82c303eeeb4e38966b126.tar.gz volse-hubzilla-2869ccfe39cbda4974a82c303eeeb4e38966b126.tar.bz2 volse-hubzilla-2869ccfe39cbda4974a82c303eeeb4e38966b126.zip | |
delivery reports - crude but mostly functional at least for zot deliveries
Diffstat (limited to 'include')
| -rw-r--r-- | include/ItemObject.php | 2 | ||||
| -rw-r--r-- | include/zot.php | 7 |
2 files changed, 6 insertions, 3 deletions
diff --git a/include/ItemObject.php b/include/ItemObject.php index d23c1c658..5296a1cf0 100644 --- a/include/ItemObject.php +++ b/include/ItemObject.php @@ -286,6 +286,7 @@ class Item extends BaseObject { 'body' => $body, 'text' => strip_tags($body), 'id' => $this->get_id(), + 'mid' => $item['mid'], 'isevent' => $isevent, 'attend' => $attend, 'consensus' => $consensus, @@ -301,6 +302,7 @@ class Item extends BaseObject { 'vwall' => t('via Wall-To-Wall:'), 'profile_url' => $profile_link, 'item_photo_menu' => item_photo_menu($item), + 'dreport' => t('Delivery Report'), 'name' => $profile_name, 'thumb' => $profile_avatar, 'osparkle' => $osparkle, diff --git a/include/zot.php b/include/zot.php index 942998b98..fb55da0fa 100644 --- a/include/zot.php +++ b/include/zot.php @@ -1579,15 +1579,16 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ continue; } + $channel = $r[0]; + $DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); + + 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() . '>'); - // allow public postings to the sys channel regardless of permissions, but not // for comments travelling upstream. Wait and catch them on the way down. |