X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;h=c89d84ec4c014f00a7bd7353ab7c52ab600c73f4;hp=0f4830b189b4d6cf5f1076239dbd71fa67eb0233;hb=5754135335377a4fc49d2295d9f8cb768c451df9;hpb=71288aa279969c9639094615c99032e31385b9f0 diff --git a/DataObjects/Events.php b/DataObjects/Events.php index 0f4830b1..c89d84ec 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -308,13 +308,13 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $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); } - + $this->person_name = $au && !empty($au->name) ? $au->name : ''; //print_r($au); //exit; @@ -347,7 +347,11 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $rem[] = $obj->toEventString(); } } - $rem[] = $remarks; + + if(!empty($remarks)){ + $rem[] = $remarks; + } + $this->remarks = implode(' : ', $rem); } @@ -483,14 +487,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $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['storedir'])) { - return $ff->Pman['storedir'] .'/Events/'.$user; - } return false; } @@ -499,6 +505,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject function writeEventLog($extra_data = false) { $logdir = $this->logDir(); + if (!$logdir) { return false; } @@ -510,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))) { - 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!? } } @@ -613,7 +621,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject function retrieveEventLog() { - + $logdir = $this->logDir(); if (!$logdir) { return false;