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
90f598c
..
7abc664
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-7,7
+7,7
@@
*
*
*/
*
*
*/
-require_once 'DB/DataObject.php';
+
class_exists('DB_DataObject') ? '' :
require_once 'DB/DataObject.php';
class Pman_Core_DataObjects_Events extends DB_DataObject
{
class Pman_Core_DataObjects_Events extends DB_DataObject
{
@@
-25,7
+25,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
public $person_id; // int(11)
public $remarks; // blob(65535) blob
public $person_table; // string(64)
public $person_id; // int(11)
public $remarks; // blob(65535) blob
public $person_table; // string(64)
-
+ public $dupe_id; // int(11)
+
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
/* the code above is auto generated do not remove the tag below */
###END_AUTOCODE
@@
-37,14
+38,18
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
{
$tn = $this->tableName();
// if not empty on_table
{
$tn = $this->tableName();
// if not empty on_table
+
if(!empty($q['person_table'])){
$jt = DB_DataObject::factory($q['person_table']);
if(!empty($q['person_table'])){
$jt = DB_DataObject::factory($q['person_table']);
+
+
- if(!array_key_exists("{$jt->tableName()}_id", $this->table())){ // coz we have triiger on mysql...
+ if(!array_key_exists("{$jt->tableName()}_id", $this->table
Columns
())){ // coz we have triiger on mysql...
$keys = $jt->keys();
$this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
$keys = $jt->keys();
$this->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}=Events.person_id)";
+
$this->selectAdd();
$this->selectAs();
$this->selectAdd();
$this->selectAs();
@@
-69,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..
}
}
@@
-86,6
+91,11
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$dt = date('Y-m-d' , strtotime($q['query']['to']));
$this->whereAdd(" {$tn}.event_when <= '$dt' ");
}
$dt = date('Y-m-d' , strtotime($q['query']['to']));
$this->whereAdd(" {$tn}.event_when <= '$dt' ");
}
+
+ if(!empty($q['_with_dupe_count'])){
+ $this->dupe_id = 0;
+ $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') {
// grouped..
/*
if (!empty($q['query']['grouped']) && $q['query']['grouped'] == 'gr') {
// grouped..
@@
-100,7
+110,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
//DB_DataObject::DebugLevel(1);
// they can only view their changes..
if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
//DB_DataObject::DebugLevel(1);
// they can only view their changes..
- $this->person_id = $au->id;
+ $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
+// $this->person_id = $au->id;
}
// _join = tablename,tablename...
}
// _join = tablename,tablename...
@@
-115,9
+126,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
// empty ontable queries.. these are valid..
$this->whereAdd("$tn.on_table = ''");
}
// empty ontable queries.. these are valid..
$this->whereAdd("$tn.on_table = ''");
}
-
-
-
+
if (isset($q['query']['person_sum'])) {
//DB_DataObject::debugLevel(1);
$this->_extra_cols = array('qty' );
if (isset($q['query']['person_sum'])) {
//DB_DataObject::debugLevel(1);
$this->_extra_cols = array('qty' );
@@
-164,7
+173,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
LEFT JOIN {$jtn} as join_on_id_{$jtn} ON {$tn}.on_id = join_on_id_{$jtn}.{$jk}
AND on_table = '{$jtn}'
";
LEFT JOIN {$jtn} as join_on_id_{$jtn} ON {$tn}.on_id = join_on_id_{$jtn}.{$jk}
AND on_table = '{$jtn}'
";
- $keys = array_keys($x->table());
+ $keys = array_keys($x->table
Columns
());
if (isset($q['_join_cols'])) {
$jcs = explode(',',$q['_join_cols'] );
//DB_DataObject::DebugLevel(1);
if (isset($q['_join_cols'])) {
$jcs = explode(',',$q['_join_cols'] );
//DB_DataObject::DebugLevel(1);
@@
-208,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')) {
@@
-233,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();
@@
-306,16
+330,19
@@
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;
} else {
$col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
// does $col exist?
if (empty($au) || (isset($au->id) && empty($au->id))) {
// not authenticated - and a standard id based object
$this->person_id = 0;
} else {
$col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
// does $col exist?
- $cols = $this->table();
+ $cols = $this->table
Columns
();
$col = isset($cols[$col]) ? $col : 'person_id'; // for BC.... - revert to using person_id
$this->{$col} = $au->pid();
$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';
@@
-354,7
+381,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
$ret = 0;
}
$ret = 0;
- foreach(array_keys($new->table()) as $k) {
+ foreach(array_keys($new->table
Columns
()) as $k) {
// should we JSON serialize this?
$n = empty($new->$k) ? '' : $new->$k;
$o = empty($old->$k) || empty($old->$k) ? '' : $old->$k;
// should we JSON serialize this?
$n = empty($new->$k) ? '' : $new->$k;
$o = empty($old->$k) || empty($old->$k) ? '' : $old->$k;
@@
-412,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)
@@
-494,7
+521,11
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
//print_r($this);
$file = $logdir. date('/Y/m/d/'). $this->id . ".json";
if (!file_exists(dirname($file))) {
//print_r($this);
$file = $logdir. date('/Y/m/d/'). $this->id . ".json";
if (!file_exists(dirname($file))) {
- mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+
+ @mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
+ if (!file_exists(dirname($file))) {
+ die("could not create $file - permissons are not correct"); // fatal, otherwise we loop!?
+ }
}
}
@@
-691,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');
}
+
+
}
}