From 49253626d266eaeba7f9c4ef9ab3322c518c6759 Mon Sep 17 00:00:00 2001 From: Laurent Destailleur Date: Wed, 15 Jul 2009 23:51:06 +0000 Subject: [PATCH] =?UTF-8?q?Fix:=20bug=20#26929=20:=20les=20fichiers=20cont?= =?UTF-8?q?enant=20le=20signe=20+=20dans=20le=20nom=20ne=20peuvent=20=EAtr?= =?UTF-8?q?e=20t=E9l=E9charg=E9s?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- htdocs/document.php | 15 +++++---------- 1 file changed, 5 insertions(+), 10 deletions(-) diff --git a/htdocs/document.php b/htdocs/document.php index de4579c992b..0a701647e15 100644 --- a/htdocs/document.php +++ b/htdocs/document.php @@ -28,9 +28,11 @@ * document.php?modulepart=repfichierconcerne&file=pathrelatifdufichier */ -$original_file = urldecode($_GET["file"]); -$modulepart = urldecode($_GET["modulepart"]); -$type = isset($_GET["type"]) ? urldecode($_GET["type"]) : ''; +// Do not use urldecode here ($_GET and $_REQUEST are already decoded by PHP). +$action = isset($_GET["action"])?$_GET["action"]:''; +$original_file = isset($_GET["file"])?$_GET["file"]:''; +$modulepart = isset($_GET["modulepart"])?$_GET["modulepart"]:''; +$urlsource = isset($_GET["urlsource"])?$_GET["urlsource"]:''; // Define if we need master or master+main $needmasteronly=false; @@ -63,13 +65,6 @@ require_once(DOL_DOCUMENT_ROOT.'/lib/files.lib.php'); // C'est un wrapper, donc header vierge function llxHeader() { } -// Default encoding for HTTP output if no encoding can be found for file to download -//$encoding='ISO-8859-1'; - -$action = $_GET["action"]; -$original_file = urldecode($_GET["file"]); -$modulepart = urldecode($_GET["modulepart"]); -$urlsource = urldecode($_GET["urlsource"]); // Define mime type $type = 'application/octet-stream';