X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=blobdiff_plain;f=DataObjects%2FEvents.php;fp=DataObjects%2FEvents.php;h=7c4b14d5a3ed8cd436ee2412d59c050bfd3606ec;hp=f90debf1ed5b1119ad4dae8766eff9d9a9d5120d;hb=7c956b1ea74995c6e42e3851cf35788fecbb40c3;hpb=8bc2e7a54b4ea36f5a9d2046020c54d732e59621 diff --git a/DataObjects/Events.php b/DataObjects/Events.php index f90debf1..7c4b14d5 100644 --- a/DataObjects/Events.php +++ b/DataObjects/Events.php @@ -476,17 +476,18 @@ class Pman_Core_DataObjects_Events extends DB_DataObject self::$extra_data = $data; } - function logDir() + function logDir($user = false) { $ff = HTML_FlexyFramework::get(); - if (function_exists('posix_getpwuid')) { - $uinfo = posix_getpwuid( posix_getuid () ); - - $user = $uinfo['name']; - } else { - $user = getenv('USERNAME'); // windows. - } - + if ($user == false) { + if (function_exists('posix_getpwuid')) { + $uinfo = posix_getpwuid( posix_getuid () ); + + $user = $uinfo['name']; + } else { + $user = getenv('USERNAME'); // windows. + } + } if (!empty($ff->Pman['storedir'])) { @@ -646,7 +647,12 @@ class Pman_Core_DataObjects_Events extends DB_DataObject $file = $logdir. $date. $this->id . ".json"; if (!file_exists(dirname($file))) { - return false; + + // try looking www-dir.. + $file = $this->logDir('www-data'). $date. $this->id . ".json"; + if (!file_exists(dirname($file))) { + return false; + } } return $file;