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

move dreport to zotlabs\zot namespace

Browse Source
This commit is contained in:
redmatrix 2016-02-19 14:02:55 -08:00
parent ebc66d7008
commit cfa2ac2d0a
2 changed files with 5 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
include/DReport.php → Zotlabs/Zot/DReport.php
View File

@ -1,5 +1,5 @@
<?php <?php
namespace Zotlabs\Zot;
class DReport { class DReport {

11
include/zot.php
View File

@ -11,7 +11,6 @@
require_once('include/crypto.php'); require_once('include/crypto.php');
require_once('include/items.php'); require_once('include/items.php');
require_once('include/hubloc.php'); require_once('include/hubloc.php');
require_once('include/DReport.php');
require_once('include/queue_fn.php'); require_once('include/queue_fn.php');
@ -1589,7 +1588,7 @@ function process_delivery($sender, $arr, $deliveries, $relay, $public = false, $
foreach($deliveries as $d) { foreach($deliveries as $d) {
$local_public = $public; $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", $r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash']) dbesc($d['hash'])
@ -2068,7 +2067,7 @@ function process_mail_delivery($sender, $arr, $deliveries) {
foreach($deliveries as $d) { 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", $r = q("select * from channel where channel_hash = '%s' limit 1",
dbesc($d['hash']) 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. // 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])) { 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() . '>'); $DR->addto_recipient($channel['channel_name'] . ' <' . $channel['channel_address'] . '@' . get_app()->get_hostname() . '>');
} }
else 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(); $result[] = $DR->get();