extern/egroupware_official
1
0
Fork 0
mirror of https://github.com/EGroupware/egroupware.git synced 2024-12-31 11:09:04 +01:00
Code Issues Packages Projects Releases Wiki Activity

Add a check & warning on mismatched encoding. Conversion will happen automatically, but warn if we know it will happen.

Browse Source
This commit is contained in:
Nathan Gray 2012-09-04 22:39:15 +00:00
parent 40e7908231
commit a85fdb63a0
1 changed files with 16 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -50,16 +50,30 @@
// Set this so plugin doesn't do any data changes
$definition_obj->plugin_options = (array)$definition_obj->plugin_options + array('dry_run' => true);
}
$options =& $definition_obj->plugin_options;
if($content['delimiter']) {
$options =& $definition_obj->plugin_options;
$options['fieldsep'] =
$content['delimiter'] == 'other' ? $content['other_delimiter'] : $content['delimiter'];
$definition_obj->plugin_options = $options;
}
$plugin = new $definition_obj->plugin;
// Check file encoding matches import
$sample = file_get_contents($content['file']['tmp_name'],false, null, 0, 1024);
$required = $options['charset'] == 'user' || !$options['charset'] ? $GLOBALS['egw_info']['user']['preferences']['common']['csv_charset'] : $options['charset'];
$encoding = mb_detect_encoding($sample,$required,true);
if($encoding && $required != $encoding)
{
$this->message = lang("Encoding mismatch. Expected %1 file, you uploaded %2.\n",
$required,
$encoding
);
}
$file = fopen($content['file']['tmp_name'], 'r');
// Some of the translation, conversion, etc look here
$GLOBALS['egw_info']['flags']['currentapp'] = $appname;
@ -85,7 +99,7 @@
$count = $plugin->import($file, $definition_obj);
$this->message = lang('%1 records processed', $count);
$this->message .= lang('%1 records processed', $count);
// Refresh opening window
if(!$content['dry-run']) $GLOBALS['egw']->js->set_onload("window.opener.egw_refresh('{$this->message}','$appname');");