DataObjects/Core_watch.php

[Pman.Core] / DataObjects / Core_watch.php

diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php
index 33aafaf..568ea97 100644 (file)
--- a/DataObjects/Core_watch.php
+++ b/DataObjects/Core_watch.php
@@ -1,4 +1,3 @@
-
 <?php
 /**
  * Table Definition for core_watch
@@ -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, '.',1)) as event_left,
-                substr( event, 0, substring_index(event, '.',1)) 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
                              
             ");
             
@@ -214,7 +217,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
     
     function notifyEvent($event)
     {
-        //print_r($event);
+        print_r($event);
        //DB_DataObject::DebugLevel(1);
         // see if there are any watches on events..
         // notify everyone flagged except the person doing it...
@@ -237,7 +240,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject
  
         $watches = $w->fetchAll();
         
-        //print_R($watches); //exit;
+        //print_R($watches); 
         
         $nn = DB_DataObject::Factory('core_notify');
         $nn->ontable    = $event->on_table;