projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_notify_recur.php
diff --git
a/DataObjects/Core_notify_recur.php
b/DataObjects/Core_notify_recur.php
index
0a45daa
..
ceca27c
100644
(file)
--- a/
DataObjects/Core_notify_recur.php
+++ b/
DataObjects/Core_notify_recur.php
@@
-2,7
+2,7
@@
/**
* Table Definition for core_notify_recur
*/
/**
* Table Definition for core_notify_recur
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
{
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
{
@@
-64,7
+64,7
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
function notifytimesRange($advance) {
$start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart)));
function notifytimesRange($advance) {
$start = date('Y-m-d H:i:s', max(strtotime("NOW"), strtotime($this->dtstart)));
- $end =
date('Y-m-d H:i:s', min(strtotime("NOW + $advance DAYS"), strtotime($this->dtend))
);
+ $end =
min( new DateTime("NOW + $advance DAYS"), new DateTime($this->dtend ) )->format('Y-m-d H:i:s'
);
return array($start, $end);
}
return array($start, $end);
}
@@
-83,6
+83,8
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
// it starts 24 hours ago.. or when dtstart
list($start, $end) = $this->notifytimesRange($advance);
// it starts 24 hours ago.. or when dtstart
list($start, $end) = $this->notifytimesRange($advance);
+ //var_dump(array($start, $end));
+ //print_r($this);
if (strtotime($start) > strtotime($end)) {
return array(); // no data..
if (strtotime($start) > strtotime($end)) {
return array(); // no data..
@@
-130,7
+132,7
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
function generateNotifications()
{
function generateNotifications()
{
- DB_DataObject::debugLevel(1);
+
//
DB_DataObject::debugLevel(1);
$w = DB_DataObject::factory($this->tableName());
$w->find();
$w = DB_DataObject::factory($this->tableName());
$w->find();
@@
-146,7
+148,8
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
$notifytimes = $this->notifyTimes(2);
$notifytimes = $this->notifyTimes(2);
- print_R($notifytimes);
+ //echo "{$this->person()->email}\n";
+ //print_R($notifytimes);
$newSearch = DB_DataObject::factory('core_notify');
$newSearch->whereAdd( 'act_start > NOW()');
$newSearch = DB_DataObject::factory('core_notify');
$newSearch->whereAdd( 'act_start > NOW()');
@@
-195,6
+198,13
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
}
}
+ function person()
+ {
+ $p = DB_DAtaObject::factory('core_person');
+ $p->get($this->person_id);
+ return $p;
+ }
+
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();