diff options
| author | redmatrix <git@macgirvin.com> | 2016-02-19 14:02:55 -0800 |
|---|---|---|
| committer | redmatrix <git@macgirvin.com> | 2016-02-19 14:02:55 -0800 |
| commit | cfa2ac2d0acc91d0d58b59156324f4ae2fea03a7 (patch) | |
| tree | bf9909d3b2354d519edcc8a6e276817c9ad0e6f5 | |
| parent | ebc66d7008adcfb104430ae527609df5da74188d (diff) | |
| download | volse-hubzilla-cfa2ac2d0acc91d0d58b59156324f4ae2fea03a7.tar.gz volse-hubzilla-cfa2ac2d0acc91d0d58b59156324f4ae2fea03a7.tar.bz2 volse-hubzilla-cfa2ac2d0acc91d0d58b59156324f4ae2fea03a7.zip | |
move dreport to zotlabs\zot namespace
| -rw-r--r-- | Zotlabs/Zot/DReport.php (renamed from include/DReport.php) | 2 | ||||
| -rw-r--r-- | include/zot.php | 11 |
2 files changed, 5 insertions, 8 deletions
diff --git a/include/DReport.php b/Zotlabs/Zot/DReport.php index ef86c8cbc..c90f4f670 100644 --- a/include/DReport.php +++ b/Zotlabs/Zot/DReport.php @@ -1,5 +1,5 @@ <?php - +namespace Zotlabs\Zot; class DReport { diff --git a/include/zot.php b/include/zot.php index 6f3d57d06..de841f956 100644 --- a/include/zot.php +++ b/include/zot.php @@ -11,7 +11,6 @@ require_once('include/crypto.php'); require_once('include/items.php'); require_once('include/hubloc.php'); -require_once('include/DReport.php'); require_once('include/queue_fn.php'); @@ -1589,7 +1588,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $ foreach($deliveries as $d) { $local_public = $public; - $DR = new DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']); + $DR = new Zotlabs\Zot\DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']); $r = q("select * from channel where channel_hash = '%s' limit 1", dbesc($d['hash']) @@ -2068,7 +2067,7 @@ function process_mail_delivery($sender, $arr, $deliveries) { foreach($deliveries as $d) { - $DR = new DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']); + $DR = new Zotlabs\Zot\DReport(z_root(),$sender['hash'],$d['hash'],$arr['mid']); $r = q("select * from channel where channel_hash = '%s' limit 1", dbesc($d['hash']) @@ -3410,14 +3409,12 @@ function process_channel_sync_delivery($sender, $arr, $deliveries) { // we should probably do this for all items, but usually we only send one. - require_once('include/DReport.php'); - if(array_key_exists('item',$arr) && is_array($arr['item'][0])) { - $DR = new DReport(z_root(),$d['hash'],$d['hash'],$arr['item'][0]['message_id'],'channel sync processed'); + $DR = new Zotlabs\Zot\DReport(z_root(),$d['hash'],$d['hash'],$arr['item'][0]['message_id'],'channel sync processed'); $DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>'); } else - $DR = new DReport(z_root(),$d['hash'],$d['hash'],'sync packet','channel sync delivered'); + $DR = new Zotlabs\Zot\DReport(z_root(),$d['hash'],$d['hash'],'sync packet','channel sync delivered'); $result[] = $DR->get(); |