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
dc6bfca
..
a445ded
100644
(file)
--- a/
DataObjects/Core_notify.php
+++ b/
DataObjects/Core_notify.php
@@
-50,14
+50,22
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
function person($set = false)
{
function person($set = false)
{
+ $def_pt = 'core_person';
+
if ($set !== false) {
$this->person_table = is_object($set) ? $set->tableName() : '';
if ($set !== false) {
$this->person_table = is_object($set) ? $set->tableName() : '';
- $this->person_id = is_object($set) ? $set->id : $set;
+
+
+
+ $person_table = empty($this->person_table) ? $def_pt : strtolower($this->person_table);
+ $col = $person_table == $def_pt ? 'person_id' : $person_table . '_id';
+
+ $this->{$col} = is_object($set) ? $set->id : $set;
return;
}
static $cache =array();
return;
}
static $cache =array();
- $person_table = empty($this->person_table) ?
'Person' : $this->person_table
;
- $col = $person_table ==
"Person"
? 'person_id' : $person_table . '_id';
+ $person_table = empty($this->person_table) ?
$def_pt : strtolower($this->person_table)
;
+ $col = $person_table ==
$def_pt
? 'person_id' : $person_table . '_id';
if (isset($cache[$person_table .':'. $this->{$col}])) {
return $cache[$person_table .':'. $this->{$col}];
if (isset($cache[$person_table .':'. $this->{$col}])) {
return $cache[$person_table .':'. $this->{$col}];
@@
-208,23
+216,22
@@
class Pman_Core_DataObjects_Core_notify extends DB_DataObject
if ($this->msgid != '') {
return 1;
}
if ($this->msgid != '') {
return 1;
}
+
// msgid is empty now..
// msgid is empty now..
- if ($this->event_id > 0 && strtotime($this->act_when) < time()) {
+ // if act_when is greater than now, then it's still pending.
+ if (strtotime($this->act_when) > time()) {
+ return 0;
+ }
+
+ // event id can be filled in with a failed attempt.
+
+ if ($this->event_id > 0) {
return -1;
}
return -1;
}
- return 0; // pending
-
- $this->whereAdd("msgid = '' AND event_id > 0 AND act_when < NOW()");
-
- break;
- case 'PENDING';
- $this->whereAdd('event_id = 0 OR (event_id > 0 AND act_when > NOW() )');
- break;
- case 'OPENED';
- $this->whereAdd('is_open > 0');
- break;
+ // event id is empty, and act_when is in the past... not sent yet..
+ return 0; // pending
}
}