X-Git-Url: http://git.roojs.org/?a=blobdiff_plain;f=DataObjects%2FEvents.php;h=9154e6152e91b01620a7700de62512a2e3ef4325;hb=16651021aec7c986875437c0f30421053a330086;hp=e9ebc1e3a3716321c5617e80e534c86a78ceb7e0;hpb=ed53743ed831dfd8d0885d4f937e89c95c4e47bb;p=Pman.Core diff --git a/DataObjects/Events.php b/DataObjects/Events.php index e9ebc1e3..9154e615 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(); @@ -61,19 +66,20 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } } else { - $person = 'Person'; + + $person = $au->tableName(); //'Person'; -- projects may not use person as the auth table... $cfg = HTML_FlexyFramework::get()->Pman; if (!empty($cfg['authTable'])) { $person =$cfg['authTable']; } $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.. } @@ -85,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.. @@ -99,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... @@ -114,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' ); @@ -163,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); @@ -207,8 +217,9 @@ 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 :" . + + 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')) { @@ -231,7 +242,12 @@ 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); + } + } @@ -305,16 +321,19 @@ 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->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'; @@ -353,7 +372,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; @@ -411,7 +430,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if (!empty($_SERVER['HTTP_X_FORWARDED_FOR'])) { $this->ipaddr = $_SERVER['HTTP_X_FORWARDED_FOR']; } - } + } } function beforeUpdate($old, $request,$roo) @@ -458,14 +477,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject self::$extra_data = $data; } - function writeEventLog($extra_data = false) + function logDir() { $ff = HTML_FlexyFramework::get(); - if (empty($ff->Pman['event_log_dir'])) { - return false; - } - - // add user (eg. www-data or local user if not..) if (function_exists('posix_getpwuid')) { $uinfo = posix_getpwuid( posix_getuid () ); @@ -473,10 +487,37 @@ class Pman_Core_DataObjects_Events extends DB_DataObject } else { $user = getenv('USERNAME'); // windows. } + + // DEPRICATED... + if (!empty($ff->Pman['event_log_dir'])) { + return $ff->Pman['event_log_dir'] . '/'.$user; + } + if (!empty($ff->Pman['storedir'])) { + return $ff->Pman['storedir'] .'/Events/'.$user; + + } + return false; + } + + + + function writeEventLog($extra_data = false) + { + $logdir = $this->logDir(); + if (!$logdir) { + return false; + } + + //print_r($this); - $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $this->id . ".json"; + $file = $logdir. date('/Y/m/d/'). $this->id . ".json"; if (!file_exists(dirname($file))) { - mkdir(dirname($file),0700,true); + + @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!? + } + } // Remove all the password from logs... @@ -502,7 +543,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $files[$k]['tmp_name'] = $this->id . '-'. $i; - $nf = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/'). $files[$k]['tmp_name']; + $nf = $logdir . date('/Y/m/d/'). $files[$k]['tmp_name']; if (!copy($f['tmp_name'], $nf)) { print_r("failed to copy {$f['tmp_name']}...\n"); } @@ -521,7 +562,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if ($extra_data !== false) { $out['EXTRA'] = $extra_data; } - if () + if ( self::$extra_data !== false) { + $out['EXTRA_DATA'] = self::$extra_data; + } file_put_contents($file, json_encode($out)); @@ -575,22 +618,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject function retrieveEventLog() { - $ff = HTML_FlexyFramework::get(); - if (empty($ff->Pman['event_log_dir'])) { - return false; - } - if (function_exists('posix_getpwuid')) { - $uinfo = posix_getpwuid( posix_getuid () ); + $logdir = $this->logDir(); + if (!$logdir) { + return false; - $user = $uinfo['name']; - } else { - $user = getenv('USERNAME'); // windows. } $date = date('/Y/m/d/', strtotime($this->event_when)); - $file = $ff->Pman['event_log_dir']. '/'. $user. $date. $this->id . ".json"; + $file = $logdir. $date. $this->id . ".json"; if (!file_exists(dirname($file))) { return false; } @@ -671,4 +708,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $roo->jok('RESTORE'); } + function selectAddPersonEmail() + { + $this->selectAdd('join_person_id_id.email as email'); + + } }