From: Edward Date: Tue, 21 Aug 2018 11:28:20 +0000 (+0800) Subject: Images.php X-Git-Url: http://git.roojs.org/?p=Pman.Core;a=commitdiff_plain;h=cc46541b180b947f7f2d859f56c2c6328aa27ad0 Images.php --- diff --git a/Images.php b/Images.php index b671abfd..707a6d62 100644 --- a/Images.php +++ b/Images.php @@ -539,6 +539,8 @@ class Pman_Core_Images extends Pman } $ff = HTML_FlexyFramework::get(); + $file = false; + if (!empty($ff->Pman['storedir'])) { $file = $ff->Pman['storedir']. '/Events/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; } @@ -547,7 +549,7 @@ class Pman_Core_Images extends Pman $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; } - if(!file_exists($file)){ + if(!$file || !file_exists($file)){ die("file was not saved"); } @@ -558,6 +560,14 @@ class Pman_Core_Images extends Pman continue; } + if (!empty($ff->Pman['storedir'])) { + $file = $ff->Pman['storedir']. '/Events/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; + } + // DEPRICATED... + if (!empty($ff->Pman['event_log_dir'])) { + $file = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/',strtotime($ev->event_when)). $ev->id . ".json"; + } + $src = $ff->Pman['event_log_dir']. '/'. $user. date('/Y/m/d/', strtotime($ev->event_when)). $f->tmp_name ; if (!file_exists($src)) { die("file was not saved");