projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Core_notify.php
[Pman.Core]
/
DataObjects
/
Core_notify.php
diff --git
a/DataObjects/Core_notify.php
b/DataObjects/Core_notify.php
index
44a3160
..
fe84b84
100644
(file)
--- a/
DataObjects/Core_notify.php
+++ b/
DataObjects/Core_notify.php
@@
-77,6
+77,11
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
return false;
}
return false;
}
+ function beforeDelete($dependants_array, $roo) {
+ if ($this->delivered()) {
+ $roo->jerr("you can not delete a record of a successfull delivery");
+ }
+ }
function act_start($set = false)
function act_start($set = false)
@@
-105,11
+110,21
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
return !empty($this->msgid);
}
return !empty($this->msgid);
}
+ function whereAddDeliveryStatus($delivered = false)
+ {
+ $tn = $this->tableName();
+ if ($delivered) {
+ $this->whereAdd("$tn.msgid IS NOT NULL AND $tn.msgid != ''");
+ } else {
+ $this->whereAdd("$tn.msgid IS NULL OR $tn.msgid = ''");
+ }
+ }
+
function status() // used by commandline reporting at present..
{
switch($this->event_id) {
case -1:
function status() // used by commandline reporting at present..
{
switch($this->event_id) {
case -1:
- return 'DELIVERED';
+ return 'DELIVERED';
//not valid..
case 0:
return 'PENDING';
default:
case 0:
return 'PENDING';
default:
@@
-130,7
+145,13
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
//DB_DAtaObject::DebugLevel(1);
// then we can build a join..
$d = DB_DataObject::Factory($q['ontable']);
//DB_DAtaObject::DebugLevel(1);
// then we can build a join..
$d = DB_DataObject::Factory($q['ontable']);
- $d->autoJoin();
+ $ji = $d->autoJoin();
+ //echo '<PRE>';print_R($ji);
+ // get cols
+ foreach($ji['join_names'] as $cname=>$fname) {
+ $this->selectAdd($fname . ' as ontable_id_' . $cname );
+ }
+
//$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
$this->_join .= "
LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
//$this->selectAdd($d->_query['data_select']); -- this will cause the same dataIndex...
$this->_join .= "
LEFT JOIN {$d->tableName()} ON {$this->tableName()}.onid = {$d->tableName()}.id
@@
-146,15
+167,15
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
switch ($q['query']['status']) {
case 'SUCCESS';
switch ($q['query']['status']) {
case 'SUCCESS';
- $this->whereAdd("msgid != ''");
+ $this->whereAdd("msgid
!= ''");
break;
case 'FAILED';
break;
case 'FAILED';
- $this->whereAdd('event_id > 0 AND act_when <= NOW() ');
- $this->is_active = 0;
+
+ $this->whereAdd("msgid = '' AND event_id > 0 AND act_when < NOW()");
+
break;
case 'PENDING';
break;
case 'PENDING';
-
- $this->is_active = 0;
+ $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )');
break;
case 'ALL':
default:
break;
case 'ALL':
default: