From cfa2ac2d0acc91d0d58b59156324f4ae2fea03a7 Mon Sep 17 00:00:00 2001
From: redmatrix <git@macgirvin.com>
Date: Fri, 19 Feb 2016 14:02:55 -0800
Subject: move dreport to zotlabs\zot namespace

---
 Zotlabs/Zot/DReport.php | 55 +++++++++++++++++++++++++++++++++++++++++++++++++
 include/DReport.php     | 55 -------------------------------------------------
 include/zot.php         | 11 ++++------
 3 files changed, 59 insertions(+), 62 deletions(-)
 create mode 100644 Zotlabs/Zot/DReport.php
 delete mode 100644 include/DReport.php

diff --git a/Zotlabs/Zot/DReport.php b/Zotlabs/Zot/DReport.php
new file mode 100644
index 000000000..c90f4f670
--- /dev/null
+++ b/Zotlabs/Zot/DReport.php
@@ -0,0 +1,55 @@
+<?php
+namespace Zotlabs\Zot;
+
+class DReport {
+
+	private $location;
+	private $sender;
+	private $recipient;
+	private $message_id;
+	private $status;
+	private $date;
+
+	function __construct($location,$sender,$recipient,$message_id,$status = 'deliver') {
+		$this->location   = $location;
+		$this->sender     = $sender;
+		$this->recipient  = $recipient;
+		$this->message_id = $message_id;
+		$this->status     = $status;
+		$this->date       = datetime_convert();
+	}
+
+	function update($status) {
+		$this->status     = $status;
+		$this->date       = datetime_convert();
+	}
+
+	function addto_recipient($name) {
+		$this->recipient = $this->recipient . ' ' . $name;
+	}
+
+	function addto_update($status) {
+		$this->status = $this->status . ' ' . $status;
+	}
+
+
+	function set($arr) {
+		$this->location   = $arr['location'];
+		$this->sender     = $arr['sender'];
+		$this->recipient  = $arr['recipient'];
+		$this->message_id = $arr['message_id'];
+		$this->status     = $arr['status'];
+		$this->date       = $arr['date'];
+	}
+
+	function get() {
+		return array(
+			'location'   => $this->location,
+			'sender'     => $this->sender,
+			'recipient'  => $this->recipient,
+			'message_id' => $this->message_id,
+			'status'     => $this->status,
+			'date'       => $this->date
+		);
+	}
+}
diff --git a/include/DReport.php b/include/DReport.php
deleted file mode 100644
index ef86c8cbc..000000000
--- a/include/DReport.php
+++ /dev/null
@@ -1,55 +0,0 @@
-<?php
-
-
-class DReport {
-
-	private $location;
-	private $sender;
-	private $recipient;
-	private $message_id;
-	private $status;
-	private $date;
-
-	function __construct($location,$sender,$recipient,$message_id,$status = 'deliver') {
-		$this->location   = $location;
-		$this->sender     = $sender;
-		$this->recipient  = $recipient;
-		$this->message_id = $message_id;
-		$this->status     = $status;
-		$this->date       = datetime_convert();
-	}
-
-	function update($status) {
-		$this->status     = $status;
-		$this->date       = datetime_convert();
-	}
-
-	function addto_recipient($name) {
-		$this->recipient = $this->recipient . ' ' . $name;
-	}
-
-	function addto_update($status) {
-		$this->status = $this->status . ' ' . $status;
-	}
-
-
-	function set($arr) {
-		$this->location   = $arr['location'];
-		$this->sender     = $arr['sender'];
-		$this->recipient  = $arr['recipient'];
-		$this->message_id = $arr['message_id'];
-		$this->status     = $arr['status'];
-		$this->date       = $arr['date'];
-	}
-
-	function get() {
-		return array(
-			'location'   => $this->location,
-			'sender'     => $this->sender,
-			'recipient'  => $this->recipient,
-			'message_id' => $this->message_id,
-			'status'     => $this->status,
-			'date'       => $this->date
-		);
-	}
-}
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();
 
-- 
cgit v1.2.3