projects
/
Pman.Core
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
|
inline
| side by side (parent:
8bc2e7a
)
getting eventlog - try www-data as thats the most likely location
author
Alan
<alan@roojs.com>
Wed, 10 Nov 2021 03:29:46 +0000
(11:29 +0800)
committer
Alan
<alan@roojs.com>
Wed, 10 Nov 2021 03:29:46 +0000
(11:29 +0800)
DataObjects/Events.php
patch
|
blob
|
history
diff --git
a/DataObjects/Events.php
b/DataObjects/Events.php
index
f90debf
..
7c4b14d
100644
(file)
--- a/
DataObjects/Events.php
+++ b/
DataObjects/Events.php
@@
-476,17
+476,18
@@
class Pman_Core_DataObjects_Events extends DB_DataObject
self::$extra_data = $data;
}
self::$extra_data = $data;
}
- function logDir()
+ function logDir(
$user = false
)
{
$ff = HTML_FlexyFramework::get();
{
$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'])) {
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))) {
$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;
}
return $file;