X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FCore_watch.php;h=e41d10d88dcf5aea77b9ace6f65d4c18b36e9b6c;hp=5682f320315d3d919f0d4bb283eba8bd7cad8dbb;hb=HEAD;hpb=53b42bc537f02e4ac5c850b853b829c98b7ba1f4 diff --git a/DataObjects/Core_watch.php b/DataObjects/Core_watch.php index 5682f320..2e207ff2 100644 --- a/DataObjects/Core_watch.php +++ b/DataObjects/Core_watch.php @@ -26,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 { @@ -47,12 +47,79 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject ###END_AUTOCODE /** make sure there is a watch for this user.. */ + + function applyFilters($q,$au, $roo) + { + if (!empty($q['_list_actions'])) { + $this->listActions($roo,$q); + } + //die("apply filters"); + if (!empty($q['_split_event_name'])) { + $this->selectAdd(" + + 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 + + "); + + + + } + + } + + function toRooSingleArray($au,$q) + { + $ret = $this->toArray(); + if (empty($q['_split_event_name'])) { + return $ret; + } + $bits = explode('.', $this->event); + $ret['event_left'] = $bits[0]; + $ret['event_right'] = $bits[1]; + // check core enu. + if (!empty($ret['event_right'])) { + $ce = DB_DataObject::factory('core_enum')->lookupObject($q['_split_event_name'], $ret['event_right']); + $ret['event_right_display_name'] = $ce->display_name; + } + + return $ret; + + + } + + function listActions($roo, $q) { + + //print_r($q); + $d = DB_DataObject::Factory($q['on_table']); + $ret = array(); + + foreach(get_class_methods($d) as $m) { + //var_dump($m); + if (!preg_match('/^notify/', $m)) { + continue; + } + $ret[] = array( + 'display_name' => preg_replace('/^notify/', '' , $m), + 'name' => $q['on_table'] .':'. $m + ); + } + $roo->jdata($ret); + } + /** * * Create a watch... * */ + + + function ensureNotify( $ontable, $onid, $person_id, $whereAdd) { //DB_DAtaObject::debugLevel(1); @@ -90,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) { @@ -112,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; @@ -134,7 +202,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject // static really... /** * - * This get's called by roo->jok() + * This get's called by roo->addEvent() * * And searches for matching '$watch->event' == $event->action * along with id/table etc.. @@ -150,6 +218,7 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject function notifyEvent($event) { + //print_r($event); //DB_DataObject::DebugLevel(1); // see if there are any watches on events.. // notify everyone flagged except the person doing it... @@ -167,37 +236,53 @@ 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; $nn->onid = $event->on_id; foreach($watches as $watch) { + $n = clone($nn); if (!$watch->person_id) { // no people??? bugs in watch table $dom = explode(':',$watch->medium); if (count($dom) != 2) { continue; } + // in some scenarios (like watching for new articles) + // we need to create a core, notify on the medium.. + // in which case we set the set $nn->evtype = medium.. + // in that case - just let the called method generate the notify.. + + //print_R($dom); $do = DB_DataObject::factory($dom[0]); if (!method_exists($do,$dom[1])) { continue; } - $do->{$dom[1]}($event); + //echo "calling {$watch->medium}\n"; + // the triggered method, can either do something + // or modify the notify event.. + if ($do->{$dom[1]}($event, $n) !== false) { + //echo "method did not return false?"; + continue; + } + - continue; } - $n = clone($nn); + $n->trigger_person_id = $event->person_id; $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); @@ -207,15 +292,11 @@ class Pman_Core_DataObjects_Core_watch extends DB_DataObject // we have a item in the queue for that waiting to be sent.. continue; } - - $n->act_start( date("Y-m-d H:i:s") ); + //echo "inserting notify?"; + $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) {