Merge https://github.com/redmatrix/redmatrix into pending_merge

2 files changed, 47 insertions, 1 deletions

diff --git a/include/DReport.php b/include/DReport.php
new file mode 100644
index 000000000..6c7bf354a
--- /dev/null
+++ b/include/DReport.php
@@ -0,0 +1,46 @@
+<?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 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/version.inc b/version.inc
index 4a93ab93e..e412e1495 100644
--- a/version.inc
+++ b/version.inc
@@ -1 +1 @@
-2015-09-19.1160
+2015-09-20.1161