From 724d52e019bc50ac0aa675312c947d7db10ce568 Mon Sep 17 00:00:00 2001 From: Jerome Nadaud Date: Wed, 27 Nov 2013 17:57:19 +0100 Subject: [PATCH] // Adding timestamp filename to csv import --- controllers/admin/AdminImportController.php | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/controllers/admin/AdminImportController.php b/controllers/admin/AdminImportController.php index 75689849b..2708307d9 100644 --- a/controllers/admin/AdminImportController.php +++ b/controllers/admin/AdminImportController.php @@ -589,7 +589,8 @@ class AdminImportControllerCore extends AdminController public function ajaxProcessuploadCsv() { - $path = _PS_ADMIN_DIR_.'/import/'.date('YmdHis').'-'; + $path = _PS_ADMIN_DIR_.'/import/'; + $filename_prefix = date('YmdHis').'-'; if (isset($_FILES['file']) && !empty($_FILES['file']['error'])) { @@ -619,10 +620,13 @@ class AdminImportControllerCore extends AdminController elseif (!preg_match('/.*\.csv$/i', $_FILES['file']['name'])) $_FILES['file']['error'] = Tools::displayError('The extension of your file should be .csv.'); elseif (!file_exists($_FILES['file']['tmp_name']) || - !@move_uploaded_file($_FILES['file']['tmp_name'], $path.$_FILES['file']['name'])) + !@move_uploaded_file($_FILES['file']['tmp_name'], $path.$filename_prefix.$_FILES['file']['name'])) $_FILES['file']['error'] = $this->l('An error occurred while uploading / copying the file.'); else - @chmod($path.$_FILES['file']['name'], 0664); + { + @chmod($path.$filename_prefix.$_FILES['file']['name'], 0664); + $_FILES['file']['filename'] = $filename_prefix.$_FILES['file']['name']; + } die(Tools::jsonEncode($_FILES)); }