From b39cc32c62ca5c920e58090fbea576bf28f32a8e Mon Sep 17 00:00:00 2001 From: edward Date: Thu, 21 Jan 2016 13:25:37 +0800 Subject: [PATCH] DataObjects/Images.php --- DataObjects/Images.php | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/DataObjects/Images.php b/DataObjects/Images.php index 6a3527d9..7668d6e5 100644 --- a/DataObjects/Images.php +++ b/DataObjects/Images.php @@ -673,7 +673,7 @@ class Pman_Core_DataObjects_Images extends DB_DataObject require_once 'File/MimeType.php'; $y = new File_MimeType(); - $this->mimetype = $filetype; + if (in_array($this->mimetype, array( 'text/application', 'application/octet-stream', @@ -683,14 +683,14 @@ class Pman_Core_DataObjects_Images extends DB_DataObject 'application/vnd.ms-excel', /// sometimes windows reports csv as excel??? 'application/csv-tab-delimited-table', // windows again!!? ))) { // weird tyeps.. - $inf = pathinfo($filename); + $inf = pathinfo($this->filename); $this->mimetype = $y->fromExt($inf['extension']); } $ext = $y->toExt(trim((string) $this->mimetype )); $this->filename = empty($this->filename) ? - $_FILES['imageUpload']['name'] : ($this->filename .'.'. $ext); + ('gen-' . date('Y-m-d H:i:s') . '.' . $ext) : ($this->filename .'.'. $ext); -- 2.39.2