lainwir3d/dolibarr
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix: UTF8 on import file name

Browse Source
This commit is contained in:
eldy 2011-09-20 13:53:47 +02:00
parent a81271b8ca
commit 683c146d0c
2 changed files with 5 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
htdocs/imports/import.php
View File

@ -548,8 +548,7 @@ if ($step == 3 && $datatoimport)
// Search available imports // Search available imports
$dir = $conf->import->dir_temp; $dir = $conf->import->dir_temp;
$newdir=utf8_check($dir)?utf8_decode($dir):$dir; // opendir need ISO $handle=@opendir(dol_osencode($dir));
$handle=@opendir($newdir);
if (is_resource($handle)) if (is_resource($handle))
{ {
//print '<tr><td colspan="4">'; //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="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 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>'; print '</center>';
} }

3
htdocs/includes/modules/import/import_csv.modules.php
View File

@ -169,8 +169,7 @@ class ImportCsv extends ModeleImports
ini_set('auto_detect_line_endings',1); // For MAC compatibility 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(dol_osencode($file), "r");
$this->handle = fopen($newfile, "r");
if (! $this->handle) if (! $this->handle)
{ {
$langs->load("errors"); $langs->load("errors");