From: Benoît Pin <benoit.pin@gmail.com>
Date: Wed, 4 Dec 2013 19:37:03 +0000 (+0100)
Subject: noms de fichiers encodés.
X-Git-Url: https://scm.cri.mines-paristech.fr/git/Plinn.git/commitdiff_plain/a8d9cafde69dd2360870cc971f8e7393c4f5a0de?ds=sidebyside

noms de fichiers encodés.
---

diff --git a/Folder.py b/Folder.py
index b762702..4db6725 100644
--- a/Folder.py
+++ b/Folder.py
@@ -31,6 +31,7 @@ from zExceptions import Unauthorized
 import sys
 import warnings
 from cgi import escape
+from urllib import unquote
 from OFS import Moniker
 from ZODB.POSException import ConflictError
 import OFS.subscribers
@@ -297,8 +298,7 @@ class PlinnFolder(CMFCatalogAware, PortalFolder, DefaultDublinCoreImpl) :
         """
 
         self.dav__init(REQUEST, RESPONSE)
-
-        fileName = REQUEST.getHeader('X-File-Name', '')
+        fileName = unquote(REQUEST.getHeader('X-File-Name', ''))
         validId = makeValidId(self, fileName, allow_dup=True)
 
         ifhdr = REQUEST.get_header('If', '')
diff --git a/skins/ajax_scripts/fileupload.js b/skins/ajax_scripts/fileupload.js
index bf36628..675ff13 100644
--- a/skins/ajax_scripts/fileupload.js
+++ b/skins/ajax_scripts/fileupload.js
@@ -68,7 +68,7 @@ DDFileUploaderBase.prototype.upload = function(item) {
 
 	req.open("PUT", this.uploadUrl);
 	req.setRequestHeader("Content-Type", file.type);
-	req.setRequestHeader("X-File-Name", file.name);
+	req.setRequestHeader("X-File-Name", encodeURI(file.name));
 	addListener(reader, 'load',
 		function(evt){
 			try {