X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify.php;h=0e80c6de33b4244ca8f19af08dadcb7fd79863f8;hb=a79147a031923e2ffa60aee669faa64386dd2336;hp=6bed15b927167a4dd9e3f26096d29195f1268fcf;hpb=d64494c39c71f6a045bc69405f4f3e21450ec24a;p=Pman.Core diff --git a/DataObjects/Core_notify.php b/DataObjects/Core_notify.php index 6bed15b9..0e80c6de 100644 --- a/DataObjects/Core_notify.php +++ b/DataObjects/Core_notify.php @@ -64,10 +64,11 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject return $set; } $c = DB_DataObject::factory($this->ontable); + if ($this->onid == 0) { return $c; // empty dataobject. } - print_r($c);exit; + $c->autoJoin(); if ($c->get($this->onid)) { @@ -101,7 +102,7 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject } function delivered() { - return !empty($msgid); + return !empty($this->msgid); } function status() // used by commandline reporting at present.. @@ -141,6 +142,23 @@ class Pman_Core_DataObjects_Core_notify extends DB_DataObject $this->whereAdd( "join_person_id_id.name LIKE '{$this->escape($q['query']['person_id_name'])}%'"); } + if (!empty($q['query']['status'])) { + switch ($q['query']['status']) { + + case 'SUCCESS'; + $this->is_active = 1; + break; + case 'FAILED'; + $this->is_active = 0; + break; + case 'PENDING'; + $this->is_active = 0; + break; + case 'ALL': + default: + break; + } + }