projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix #8131 - chinese translations
[Pman.Core]
/
DataObjects
/
Core_watch.php
diff --git
a/DataObjects/Core_watch.php
b/DataObjects/Core_watch.php
index
d617cd6
..
2e207ff
100644
(file)
--- 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
{
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
{
@@
-58,7
+58,11
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
$this->selectAdd("
substr( event, 1, LOCATE( '.',event) -1) as event_left,
$this->selectAdd("
substr( event, 1, LOCATE( '.',event) -1) as event_left,
- substr( event, LOCATE( '.',event) +1) as event_right
+ 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
");
");
@@
-153,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 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) {
{
$w = DB_DataObject::factory('core_watch');
if ($whereAdd !== false) {
@@
-175,11
+182,9
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
continue;
}
continue;
}
-
-
$nn = DB_DataObject::Factory('core_notify');
$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;
$nn->evtype = $w->medium;
$nn->person_id = $w->person_id;
@@
-214,7
+219,7
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
function notifyEvent($event)
{
//print_r($event);
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... -
// see if there are any watches on events..
// notify everyone flagged except the person doing it...
// this is very basic logic... -
@@
-231,12
+236,14
@@
class Pman_Core_DataObjects_Core_watch extends DB_DataObject
$w->event = $event->action;
$w->active = 1;
$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();
$watches = $w->fetchAll();
- //print_R($watches);
//exit;
+ //print_R($watches);
$nn = DB_DataObject::Factory('core_notify');
$nn->ontable = $event->on_table;
$nn = DB_DataObject::Factory('core_notify');
$nn->ontable = $event->on_table;
@@
-275,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->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);
// does this watch already have a flag...
$nf = clone($n);
@@
-288,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();
}
$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) {
}
function initDatabase($roo, $data) {
foreach($data as $d) {