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_recur.php
[Pman.Core]
/
DataObjects
/
Core_notify_recur.php
diff --git
a/DataObjects/Core_notify_recur.php
b/DataObjects/Core_notify_recur.php
index
fa8e58e
..
b4f8cd3
100644
(file)
--- a/
DataObjects/Core_notify_recur.php
+++ b/
DataObjects/Core_notify_recur.php
@@
-84,9
+84,6
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
list($start, $end) = $this->notifytimesRange($advance);
list($start, $end) = $this->notifytimesRange($advance);
- print_R($start);
- print_r($end);exit;
-
if (strtotime($start) > strtotime($end)) {
return array(); // no data..
}
if (strtotime($start) > strtotime($end)) {
return array(); // no data..
}
@@
-113,14
+110,18
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
$usedays[] = date("Y-m-d", $ut);
}
}
$usedays[] = date("Y-m-d", $ut);
}
}
-
+
//print_r($this);
foreach($usedays as $d){
foreach($hours as $h){
$date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
//print_r($this);
foreach($usedays as $d){
foreach($hours as $h){
$date = new DateTime($d. ' ' . $h, new DateTimeZone($this->tz));
- $date->setTimezone(new DateTimeZone(ini_get('date.timezone')));
+ $tz= ini_get('date.timezone');
+ if(!empty($tz)){
+ $date->setTimezone(new DateTimeZone($tz));
+ }
+
$ret[] = $date->format('Y-m-d H:i:s');
}
}
$ret[] = $date->format('Y-m-d H:i:s');
}
}
@@
-145,7
+146,7
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
$notifytimes = $this->notifyTimes(2);
$notifytimes = $this->notifyTimes(2);
-
////
print_R($notifytimes);
+ 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()');
@@
-154,12
+155,10
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
// returns array('2012-12-xx'=>12, 'date' => id....)
// returns array('2012-12-xx'=>12, 'date' => id....)
-
foreach($notifytimes as $time){
if (isset($old[$time])) {
// we already have it...
foreach($notifytimes as $time){
if (isset($old[$time])) {
// we already have it...
-
$oo = DB_DataObject::Factory('core_notify');
$oo->get($old[$time]);
$oc = clone($oo);
$oo = DB_DataObject::Factory('core_notify');
$oo->get($old[$time]);
$oc = clone($oo);
@@
-169,12
+168,11
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
unset($old[$time]);
continue;
}
unset($old[$time]);
continue;
}
- if (strtotime($time) < time()) {
- // will not get deleted..
- //echo "SKIP BEFORE NOW";
- unset($old[$time]);
+
+ if (strtotime($time) < time()) { // should not happen, just in case...
continue;
}
continue;
}
+
// do not have a notify event... creat it..
$add = DB_DataObject::factory('core_notify');
$add->setFrom(array(
// do not have a notify event... creat it..
$add = DB_DataObject::factory('core_notify');
$add->setFrom(array(
@@
-197,6
+195,13
@@
class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
}
}
+ function person()
+ {
+ $p = DB_DAtaObject::factory('Person');
+ $p->get($this->person_id);
+ return $p;
+ }
+
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();
function onUpdate($old, $request,$roo)
{
$this->generateNotificationsSingle();