holm/egroupware
1
1
Fork 0
forked from extern/egroupware
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Fix missed usage of user charset preference in CSV check

Browse Source
This commit is contained in:
Nathan Gray 2013-05-13 15:53:17 +00:00
parent 2a001498a1
commit a004c7f4ea
1 changed files with 5 additions and 1 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
importexport/inc/class.importexport_import_ui.inc.php
View File

@ -341,9 +341,12 @@
// Only CSV files // Only CSV files
if(!$options['csv_fields']) return true; if(!$options['csv_fields']) return true;
$preference = $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'];
$charset = $options['charset'] == 'user' || !$options['charset'] ? $preference : $options['charset'];
$data = fgetcsv($file, 8000, $options['fieldsep']); $data = fgetcsv($file, 8000, $options['fieldsep']);
rewind($file); rewind($file);
$data = translation::convert($data,$options['charset']); $data = translation::convert($data,$charset);
$ok = true; $ok = true;
if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields']))) if(count($data) != count($options['csv_fields']) && max(array_keys($data)) != max(array_keys($options['csv_fields'])))
@ -393,6 +396,7 @@
{ {
continue; continue;
} }
//error_log("Raw[Defn: {$options['csv_fields'][$index]} File: $header] Lang[Defn: $lang_defn File: $lang_file] MSG_ID[Defn: $defn_message_id File: $file_message_id]");
// Problem // Problem
$message[] = lang("Column mismatch: %1 should be %2, not %3", $message[] = lang("Column mismatch: %1 should be %2, not %3",