X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_notify_recur.php;h=ceca27cb28f11d8144010a2e3a0beb3c719e9ea4;hp=e495ce74d7b795bbd53d9f609c0cc11c4b86c77f;hb=HEAD;hpb=1d3319c0b7a74d3bc8a844e2a0c70a8eb05e55c0

diff --git a/DataObjects/Core_notify_recur.php b/DataObjects/Core_notify_recur.php
index e495ce74..ceca27cb 100644
--- a/DataObjects/Core_notify_recur.php
+++ b/DataObjects/Core_notify_recur.php
@@ -2,7 +2,7 @@
 /**
  * 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 
 {
@@ -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,7 +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));
+        //var_dump(array($start, $end));
+        //print_r($this);
         
         if (strtotime($start) > strtotime($end)) {
             return array(); // no data..
@@ -147,8 +148,8 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
         
 
         $notifytimes = $this->notifyTimes(2);
-        echo "{$this->person()->email}\n";
-        print_R($notifytimes);
+        //echo "{$this->person()->email}\n";
+        //print_R($notifytimes);
         
         $newSearch = DB_DataObject::factory('core_notify');
         $newSearch->whereAdd( 'act_start > NOW()');
@@ -199,7 +200,7 @@ class Pman_Core_DataObjects_Core_notify_recur extends DB_DataObject
     
     function person()
     {
-        $p = DB_DAtaObject::factory('Person');
+        $p = DB_DAtaObject::factory('core_person');
         $p->get($this->person_id);
         return $p;
     }