X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;h=e8682ac8f2cadde618b6512710cb4b1c744fc85e;hp=e285634514dbc698ca5cc7afd9f9773981437200;hb=1524f8b36295809a3eedd6da3c6494f8aa0d86f5;hpb=20a1767ee00f8285701364c515a21b40ca40e404 diff --git a/DataObjects/Events.php b/DataObjects/Events.php index e2856345..e8682ac8 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -254,7 +254,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $tnb = $this->escape($q['query']['on_table']); $this->whereAdd("Events.on_table LIKE '%{$tnb}%'"); } - echo "fuk"; die; + } function applyPermissionFilters($q, $au ,$roo) @@ -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); } @@ -513,8 +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))) { - print_r($this); - 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!? } } @@ -547,6 +551,9 @@ class Pman_Core_DataObjects_Events extends DB_DataObject print_r("failed to copy {$f['tmp_name']}...\n"); } } + + + $out = array( 'REQUEST_URI' => empty($_SERVER['REQUEST_URI']) ? 'cli' : $_SERVER['REQUEST_URI'], 'HTTP_USER_AGENT' => empty($_SERVER['HTTP_USER_AGENT']) ? '' : $_SERVER['HTTP_USER_AGENT'], @@ -564,6 +571,16 @@ class Pman_Core_DataObjects_Events extends DB_DataObject if ( self::$extra_data !== false) { $out['EXTRA_DATA'] = self::$extra_data; } + $total_data = 0; + foreach($out as $k=>$v) { + if (!empty($v) && $k != 'REQUEST_URI') { + $total_data++; + } + } + if (!$total_data) { + return; // do not write an empty file with no usefull info. + } + file_put_contents($file, json_encode($out)); @@ -617,7 +634,7 @@ class Pman_Core_DataObjects_Events extends DB_DataObject function retrieveEventLog() { - + $logdir = $this->logDir(); if (!$logdir) { return false;