X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=ff8ac4a740bf7be2e330a26fd9909fc6a22adc62;hb=4387b91fb9b86c48608fcc468d8e3cb5a7a7bd43;hp=90f598cf8ca81f61479fb2c5be1b5b70d754b8ba;hpb=b362c5c141f2ce575cbddf24e93d9465a23e699f;p=Pman.Core diff --git a/DataObjects/Events.php b/DataObjects/Events.php index 90f598cf..ff8ac4a7 100644 --- 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 { @@ -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 $dupe_id; // int(11) + /* 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 + 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->tableColumns())){ // 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)"; + $this->selectAdd(); $this->selectAs(); @@ -69,12 +74,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } $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' "); } + + 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.. @@ -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.. - $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... @@ -115,9 +126,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject // 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' ); @@ -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}' "; - $keys = array_keys($x->table()); + $keys = array_keys($x->tableColumns()); if (isset($q['_join_cols'])) { $jcs = explode(',',$q['_join_cols'] ); //DB_DataObject::DebugLevel(1); @@ -208,6 +217,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if (!$obj) { $roo->jerr("ontable is invalid"); } + /* if (!method_exists($obj,'relatedWhere')) { $roo->jerr( $q['_related_on_table'] . " Does not have method relatedWhere :" . implode(',', get_class_methods($obj))); @@ -231,12 +241,17 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } $this->whereAdd(implode(' OR ' , $w)); + }*/ + if ($obj && method_exists($obj,'relatedEventsWhere')) { + $a = $obj->relatedEventsWhere($q,$roo); + if($a){ + $this->whereAdd($a); + } } - } // since roo does not support autojoin yet.. if (!isset($q['_distinct'])) { @@ -306,16 +321,33 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } $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? - $cols = $this->table(); + $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->who = $au->name; + + if($au->tableName() == "modx_users"){ + $e = PDO_DataObject::factory('ext_data'); + $e->setFrom(array( + 'userdata_id' => $au->pid(), + )); + print_r($e); + exit; + if($e->find(true)){ + $this->who = $e->getUserName(); + } + } } $this->person_table = $au ? $au->tableName() : ''; $this->ipaddr = isset($_SERVER["REMOTE_ADDR"]) ? $_SERVER["REMOTE_ADDR"] : 'cli'; @@ -354,7 +386,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } $ret = 0; - foreach(array_keys($new->table()) as $k) { + foreach(array_keys($new->tableColumns()) as $k) { // should we JSON serialize this? $n = empty($new->$k) ? '' : $new->$k; $o = empty($old->$k) || empty($old->$k) ? '' : $old->$k; @@ -494,7 +526,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))) { - 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!? + } }