projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
DataObjects/Events.php
[Pman.Core]
/
DataObjects
/
Events.php
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
463ea3e
..
7abc664
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-74,12
+74,12
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
$jt = DB_DataObject::factory($person);
}
$jt = DB_DataObject::factory($person);
- $this->whereAdd("
- person_table = '{$jt->tableName()}'
- OR
- person_table = ''
- OR person_table IS NULL"
- ); // default to our standard.. - unless otherwise requested..
+
//
$this->whereAdd("
+
//
person_table = '{$jt->tableName()}'
+
//
OR
+
//
person_table = ''
+
//
OR person_table IS NULL"
+
//
); // default to our standard.. - unless otherwise requested..
}
}
@@
-94,7
+94,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if(!empty($q['_with_dupe_count'])){
$this->dupe_id = 0;
if(!empty($q['_with_dupe_count'])){
$this->dupe_id = 0;
- $this->selectAdd("(select count(*)+1 from Events
where Events
.dupe_id = {$tn}.id) as dupe_count");
+ $this->selectAdd("(select count(*)+1 from Events
ev_cnt where ev_cnt
.dupe_id = {$tn}.id) as dupe_count");
}
/*
if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
}
/*
if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
@@
-217,8
+217,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (!$obj) {
$roo->jerr("ontable is invalid");
}
if (!$obj) {
$roo->jerr("ontable is invalid");
}
- if (!method_exists($obj,'relatedWhere')) {
- $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" .
+
+ if (!method_exists($obj,'relatedWhere') && !method_exists($obj,'relatedEventsWhere')) {
+ $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere or relatedEventsWhere:" .
implode(',', get_class_methods($obj)));
}
if ($obj && method_exists($obj,'relatedWhere')) {
implode(',', get_class_methods($obj)));
}
if ($obj && method_exists($obj,'relatedWhere')) {
@@
-242,11
+243,25
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$this->whereAdd(implode(' OR ' , $w));
}
$this->whereAdd(implode(' OR ' , $w));
}
+ if ($obj && method_exists($obj,'relatedEventsWhere')) {
+ $a = $obj->relatedEventsWhere($q,$roo);
+ if($a){
+ $this->whereAdd($a);
+ }
+ }
}
}
+ if (isset($q['_who'])) {
+
+ //$e = PDO_DataObject::factory('ext_data');
+ //$this->joinAdd($e,'LEFT');
+ //$this->autoJoinCorePerson();
+ //$this->selectAddWho();
+ }
+
// since roo does not support autojoin yet..
if (!isset($q['_distinct'])) {
//$this->autoJoinExtra();
// since roo does not support autojoin yet..
if (!isset($q['_distinct'])) {
//$this->autoJoinExtra();
@@
-315,6
+330,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
$this->person_name = $au && !empty($au->name) ? $au->name : '';
}
$this->person_name = $au && !empty($au->name) ? $au->name : '';
+ //print_r($au);
+ //exit;
+ //$this->who = $au && !empty($au->name) ? $au->name : '';
if (empty($au) || (isset($au->id) && empty($au->id))) {
// not authenticated - and a standard id based object
$this->person_id = 0;
if (empty($au) || (isset($au->id) && empty($au->id))) {
// not authenticated - and a standard id based object
$this->person_id = 0;
@@
-324,7
+342,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$cols = $this->tableColumns();
$col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
$this->{$col} = $au->pid();
$cols = $this->tableColumns();
$col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
$this->{$col} = $au->pid();
- //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
+ //$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
}
$this->person_table = $au ? $au->tableName() : '';
$this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
}
$this->person_table = $au ? $au->tableName() : '';
$this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli';
@@
-421,7
+439,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) {
$this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR'];
}
- }
+ }
}
function beforeUpdate($old, $request,$roo)
}
function beforeUpdate($old, $request,$roo)
@@
-704,4
+722,6
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$this->selectAdd('join_person_id_id.email as email');
}
$this->selectAdd('join_person_id_id.email as email');
}
+
+
}
}