From 343339f3924071e0951d7ff35eddfeb83266b3cd Mon Sep 17 00:00:00 2001
From: Armand Bahi <armand.bahi@veremes.com>
Date: Fri, 25 Jan 2019 09:59:26 +0100
Subject: [PATCH] =?UTF-8?q?Probl=C3=A8me=20encodage=20noms=20des=20fichier?=
=?UTF-8?q?s?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
---
.../externs/formReader/component/file_picker/file_picker.js | 4 ++++
src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc | 2 +-
2 files changed, 5 insertions(+), 1 deletion(-)
diff --git a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
index 6e109445..189063d7 100644
--- a/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
+++ b/src/vitis/client/javascript/externs/formReader/component/file_picker/file_picker.js
@@ -252,6 +252,10 @@ nsVitisComponent.FilePickerDirective = function ($timeout, $translate, propertie
}
}
+ if (goog.isDefAndNotNull(sName)) {
+ sName = decodeURI(sName);
+ }
+
return sName;
}
diff --git a/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc b/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
index 3e7fc84f..7242f83a 100755
--- a/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
+++ b/src/vitis/vas/rest/ws/vitis/FileDownloader.class.inc
@@ -176,7 +176,7 @@ class FileDownloader extends Vitis {
if (file_exists($sFilePath)) {
$sContentType = $this->getMime($sFilePath);
header("Content-Type: " . $sContentType);
- header("Content-disposition: attachment; filename=\"" . $sFileName . "\"");
+ header("Content-disposition: attachment; filename=\"" . rawurlencode($sFileName) . "\"");
header('Content-Length: ' . filesize($sFilePath));
if ($sContentType === "application/octet-stream") {
header("Content-Transfer-Encoding: Binary");
--
GitLab