aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorredmatrix <redmatrix@redmatrix.me>2015-09-20 00:28:22 -0700
committerredmatrix <redmatrix@redmatrix.me>2015-09-20 00:28:22 -0700
commit996cd7e2aba37ce2c4613753a68552c92dcb9be9 (patch)
tree2b24cfe6d080e3caef06faf9dfec4720885ac41b
parentce064188c6d26b7c3b331d1d163988af70e3f2b9 (diff)
parent77df590f6516435e5c43a8d0f20e857951264941 (diff)
downloadvolse-hubzilla-996cd7e2aba37ce2c4613753a68552c92dcb9be9.tar.gz
volse-hubzilla-996cd7e2aba37ce2c4613753a68552c92dcb9be9.tar.bz2
volse-hubzilla-996cd7e2aba37ce2c4613753a68552c92dcb9be9.zip
Merge https://github.com/redmatrix/redmatrix into pending_merge
-rw-r--r--include/DReport.php46
-rw-r--r--version.inc2
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