X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=e41d10d88dcf5aea77b9ace6f65d4c18b36e9b6c;hp=df9ee0fce6062441b4ef4d4b5884d2dca2baadb9;hb=HEAD;hpb=7e2e2bad827bfcd02894604ac3d53bc05b7128ac

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index df9ee0fc..2e207ff2 100644
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Table Definition for core_watch
@@ -27,7 +26,7 @@
  * 
  * 
  */
-require_once 'DB/DataObject.php';
+class_exists('DB_DataObject') ? '' : require_once 'DB/DataObject.php';
 
 class Pman_Core_DataObjects_Core_watch extends DB_DataObject 
 {
@@ -58,8 +57,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         if (!empty($q['_split_event_name'])) {
             $this->selectAdd("
                 
-                substr( event, substring_index(event, '.',0)) as event_left,
-                substr( event, 0, substring_index(event, '.',0)) as event_right        
+                substr( event, 1, LOCATE( '.',event) -1) as event_left,
+                substr( event,   LOCATE( '.',event) +1) as event_right,
+                (SELECT
+                    display_name FROM core_enum where etype = '{$this->escape($q['_split_event_name'])}'
+                    AND name = substr( event,   LOCATE( '.',event) +1)
+                ) as event_right_display_name
                              
             ");
             
@@ -154,9 +157,12 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
      *  @param int    $onid    - the id of the row changed
      *  @param string  $whereAdd (optiona) - a DB whereAdd() condition to filter the search for watches
      *  @param datetime    $when   (default now)  - date/time to create the notification for (Eg. end of day..)
+     *  @param string $to_ontable  - notify event create on this table, rather than watch table.
+     *  @param string $to_id  - notify event create on this id, rather than watch id.
+     *  
      * 
      */
-    function notify($ontable , $onid, $whereAdd = false, $when=false)
+    function notify($ontable , $onid, $whereAdd = false, $when=false, $to_ontable=false, $to_onid=false)
     {
         $w = DB_DataObject::factory('core_watch');   
         if ($whereAdd !== false) { 
@@ -176,11 +182,9 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
                 continue;
             }
          
-         
-         
             $nn = DB_DataObject::Factory('core_notify');
-            $nn->ontable = $ontable;
-            $nn->onid = $onid;
+            $nn->ontable = $to_ontable === false ? $ontable : $to_ontable;
+            $nn->onid = $to_onid === false ?  $onid : $to_onid;
             $nn->evtype = $w->medium;
             $nn->person_id = $w->person_id;
             
@@ -215,7 +219,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     function notifyEvent($event)
     {
         //print_r($event);
-       //DB_DataObject::DebugLevel(1);
+        //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
         // this is very basic logic... -
@@ -232,12 +236,14 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
         $w->event  = $event->action;
         $w->active = 1;
         
-        
-        $w->whereAdd('person_id != '. (int) $event->person_id);
+        // not sure why this is here... - it breaks on the reader article -> 
+        if ($event->person_id) {
+            $w->whereAdd('person_id != '. (int) $event->person_id);
+        }
  
         $watches = $w->fetchAll();
         
-        //print_R($watches); //exit;
+        //print_R($watches); 
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;
@@ -276,6 +282,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $n->trigger_event_id = $event->id;
             $n->person_id = $watch->person_id;
             $n->watch_id =  $watch->id;
+            $n->evtype   = $watch->medium;
             
             // does this watch already have a flag...
             $nf = clone($n);
@@ -289,9 +296,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
             $n->act_start( empty($n->act_start) ? date("Y-m-d H:i:s") : $n->act_start );
             $n->insert();
         }
-        
-        
-        
+         
     }
     function initDatabase($roo, $data) {
         foreach($data as $d) {