projects
/
Pman.Core
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
fix group concat on members list
[Pman.Core]
/
DataObjects
/
Events.php
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
9c4569d
..
c89d84e
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-257,9
+257,14
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
}
}
- function
permission_filter(
)
+ function
applyPermissionFilters($q, $au ,$roo
)
{
{
-
+ if (!$au->hasPerm("Admin.Admin_Tab", 'S')) {
+ //DB_DataObject::DebugLevel(1);
+ // they can only view their changes..
+ $this->whereAdd("($tn.person_id = {$au->id} OR $tn.person_id = 0)");
+// $this->person_id = $au->id;
+ }
}
/**
}
/**
@@
-303,13
+308,13
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$ff = HTML_FlexyFramework::get();
$pg = $ff->page;
$au = $pg->getAuthUser();
$ff = HTML_FlexyFramework::get();
$pg = $ff->page;
$au = $pg->getAuthUser();
-
+
if ($ff->cli) { // && empty($au) && isset($obj->person_id)) {
$au = false;
// $au = DB_DataObject::Factory('Person'); // not always a person..
// $au->get($obj->person_id);
}
if ($ff->cli) { // && empty($au) && isset($obj->person_id)) {
$au = false;
// $au = DB_DataObject::Factory('Person'); // not always a person..
// $au->get($obj->person_id);
}
-
+
$this->person_name = $au && !empty($au->name) ? $au->name : '';
//print_r($au);
//exit;
$this->person_name = $au && !empty($au->name) ? $au->name : '';
//print_r($au);
//exit;
@@
-342,7
+347,11
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$rem[] = $obj->toEventString();
}
}
$rem[] = $obj->toEventString();
}
}
- $rem[] = $remarks;
+
+ if(!empty($remarks)){
+ $rem[] = $remarks;
+ }
+
$this->remarks = implode(' : ', $rem);
}
$this->remarks = implode(' : ', $rem);
}
@@
-478,14
+487,16
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
$user = getenv('USERNAME'); // windows.
}
$user = getenv('USERNAME'); // windows.
}
- // DEPRICATED...
+
+
+ if (!empty($ff->Pman['storedir'])) {
+ return $ff->Pman['storedir'] .'/Events/'.$user;
+ }
+ // DEPRICATED...
if (!empty($ff->Pman['event_log_dir'])) {
return $ff->Pman['event_log_dir'] . '/'.$user;
}
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;
}
return false;
}
@@
-494,6
+505,7
@@
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 (!$logdir) {
return false;
}
if (!$logdir) {
return false;
}
@@
-505,7
+517,8
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
@mkdir(dirname($file),0700,true); // this might fail if it does not have correct permissions..
if (!file_exists(dirname($file))) {
@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!?
+ //print_r($this);
+ die("Events:: writeEventLog: could not create $file - permissons are not correct\n"); // fatal, otherwise we loop!?
}
}
}
}
@@
-608,7
+621,7
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
function retrieveEventLog()
{
function retrieveEventLog()
{
-
+
$logdir = $this->logDir();
if (!$logdir) {
return false;
$logdir = $this->logDir();
if (!$logdir) {
return false;