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
43511e9
..
72f2e2b
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,7
@@
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)
-
+
/* 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
+37,21
@@
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']);
+
+ $et = DB_DataObject::factory($tn);
+ //$this->selectAdd("(select count(*) from Events where Events.dup_id = evet.id) as cnt ");
+ //$this->selectAs($et,'%s','evet');
+ //$tn='evet';
- 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();
$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->_join = "LEFT JOIN {$jt->tableName()} AS join_person_id_id ON (join_person_id_id.{$keys[0]}={$tn}.person_id)";
+ //$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();
@@
-61,7
+68,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
} else {
}
} 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'];
$cfg = HTML_FlexyFramework::get()->Pman;
if (!empty($cfg['authTable'])) {
$person =$cfg['authTable'];
@@
-99,7
+107,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...
@@
-112,11
+121,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if (isset($q['on_table']) && !strlen($q['on_table'])) {
// empty ontable queries.. these are valid..
if (isset($q['on_table']) && !strlen($q['on_table'])) {
// empty ontable queries.. these are valid..
- $this->whereAdd("
$tn
.on_table = ''");
+ $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' );
@@
-163,7
+170,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);
@@
-244,12
+251,12
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
if(!empty($q['query']['action'])) {
$act = $this->escape($q['query']['action']);
if(!empty($q['query']['action'])) {
$act = $this->escape($q['query']['action']);
- $this->whereAdd("
Events
.action LIKE '%{$act}%'");
+ $this->whereAdd("
{$tn}
.action LIKE '%{$act}%'");
}
if(!empty($q['query']['on_table'])) {
$tnb = $this->escape($q['query']['on_table']);
}
if(!empty($q['query']['on_table'])) {
$tnb = $this->escape($q['query']['on_table']);
- $this->whereAdd("
Events
.on_table LIKE '%{$tnb}%'");
+ $this->whereAdd("
{$tn}
.on_table LIKE '%{$tnb}%'");
}
}
}
}
@@
-311,7
+318,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
} else {
$col = $au->tableName() == "Person" ? 'person_id' : $au->tableName() . '_id';
// does $col exist?
} 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();
//$this->person_id = $au ? (!empty($au->id) ? $au->id : $au->pid()) : -1;
$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;
@@
-353,7
+360,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;
@@
-461,12
+468,20
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
function logDir()
{
$ff = HTML_FlexyFramework::get();
function logDir()
{
$ff = HTML_FlexyFramework::get();
+ if (function_exists('posix_getpwuid')) {
+ $uinfo = posix_getpwuid( posix_getuid () );
+
+ $user = $uinfo['name'];
+ } else {
+ $user = getenv('USERNAME'); // windows.
+ }
+
// DEPRICATED...
if (!empty($ff->Pman['event_log_dir'])) {
// DEPRICATED...
if (!empty($ff->Pman['event_log_dir'])) {
- return $ff->Pman['event_log_dir'];
+ return $ff->Pman['event_log_dir']
. '/'.$user
;
}
if (!empty($ff->Pman['storedir'])) {
}
if (!empty($ff->Pman['storedir'])) {
- return $ff->Pman['storedir'] .'/Events
'
;
+ return $ff->Pman['storedir'] .'/Events
/'.$user
;
}
return false;
}
return false;
@@
-477,22
+492,20
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
function writeEventLog($extra_data = false)
{
$logdir = $this->logDir();
function writeEventLog($extra_data = false)
{
$logdir = $this->logDir();
- if (!$
this->logDir()
) {
+ if (!$
logdir
) {
return false;
}
return false;
}
- // add user (eg. www-data or local user if not..)
- if (function_exists('posix_getpwuid')) {
- $uinfo = posix_getpwuid( posix_getuid () );
- $user = $uinfo['name'];
- } else {
- $user = getenv('USERNAME'); // windows.
- }
//print_r($this);
//print_r($this);
- $file = $
dir. '/'. $user.
date('/Y/m/d/'). $this->id . ".json";
+ $file = $
logdir.
date('/Y/m/d/'). $this->id . ".json";
if (!file_exists(dirname($file))) {
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...
}
// Remove all the password from logs...
@@
-518,7
+531,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$files[$k]['tmp_name'] = $this->id . '-'. $i;
$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");
}
if (!copy($f['tmp_name'], $nf)) {
print_r("failed to copy {$f['tmp_name']}...\n");
}
@@
-593,22
+606,16
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
function retrieveEventLog()
{
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));
}
$date = date('/Y/m/d/', strtotime($this->event_when));
- $file = $
ff->Pman['event_log_dir']. '/'. $use
r. $date. $this->id . ".json";
+ $file = $
logdi
r. $date. $this->id . ".json";
if (!file_exists(dirname($file))) {
return false;
}
if (!file_exists(dirname($file))) {
return false;
}
@@
-689,4
+696,9
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$roo->jok('RESTORE');
}
$roo->jok('RESTORE');
}
+ function selectAddPersonEmail()
+ {
+ $this->selectAdd('join_person_id_id.email as email');
+
+ }
}
}