From 683c146d0cc63f79b83b712663327d5d40cf3ecf Mon Sep 17 00:00:00 2001
From: eldy <eldy@destailleur.fr>
Date: Tue, 20 Sep 2011 13:53:47 +0200
Subject: [PATCH] Fix: UTF8 on import file name

---
 htdocs/imports/import.php                             | 9 ++++-----
 htdocs/includes/modules/import/import_csv.modules.php | 3 +--
 2 files changed, 5 insertions(+), 7 deletions(-)

diff --git a/htdocs/imports/import.php b/htdocs/imports/import.php
index 97d4d8252d3..1116f27e9b2 100644
--- a/htdocs/imports/import.php
+++ b/htdocs/imports/import.php
@@ -548,8 +548,7 @@ if ($step == 3 && $datatoimport)
 
 	// Search available imports
 	$dir = $conf->import->dir_temp;
-	$newdir=utf8_check($dir)?utf8_decode($dir):$dir;	// opendir need ISO
-	$handle=@opendir($newdir);
+	$handle=@opendir(dol_osencode($dir));
 	if (is_resource($handle))
 	{
 		//print '<tr><td colspan="4">';
@@ -1399,14 +1398,14 @@ if ($step == 5 && $datatoimport)
             {
                 //print '<a class="butAction" href="'.DOL_URL_ROOT.'/imports/import.php?leftmenu=import&step=5&action=launchsimu'.$param.'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
-                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
+                print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("CorrectErrorBeforeRunningImport")).'">'.$langs->trans("RunImportFile").'</a>';
             }
         }
         else
         {
-            print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
+            print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunSimulateImportFile").'</a>';
 
-            print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->trans("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
+            print '<a class="butActionRefused" href="#" title="'.dol_escape_htmltag($langs->transnoentitiesnoconv("NotEnoughPermissions")).'">'.$langs->trans("RunImportFile").'</a>';
         }
         print '</center>';
     }
diff --git a/htdocs/includes/modules/import/import_csv.modules.php b/htdocs/includes/modules/import/import_csv.modules.php
index 5a3532c54ff..4378cd0c19e 100644
--- a/htdocs/includes/modules/import/import_csv.modules.php
+++ b/htdocs/includes/modules/import/import_csv.modules.php
@@ -169,8 +169,7 @@ class ImportCsv extends ModeleImports
 
 		ini_set('auto_detect_line_endings',1);	// For MAC compatibility
 
-		$newfile=utf8_check($file)?utf8_decode($file):$file;	// fopen need ISO file name
-		$this->handle = fopen($newfile, "r");
+		$this->handle = fopen(dol_osencode($file), "r");
 		if (! $this->handle)
 		{
 			$langs->load("errors");