X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=3c871ddfc716ef593d4e02b94b5c21072f38f4cf;hb=a10228b0478a4f93e13abdd8b5caaeeb6e3e2b48;hp=514ef385f370fec02c857d8b703be916d910c67d;hpb=15eb24e45b9cc3fee1ab43327a4b5b67a9777011;p=Pman.Core

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index 514ef385..3c871ddf 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -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)));
-        $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);
     }
@@ -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);
+        var_dump(array($start, $end));
+        print_r($this);
         
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
@@ -146,6 +148,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
+        echo "{$this->person()->email}\n";
         print_R($notifytimes);
         
         $newSearch = DB_DataObject::factory('core_notify');
@@ -195,6 +198,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();