From a85fdb63a0ff677185e848249694e4c7c9f77029 Mon Sep 17 00:00:00 2001
From: Nathan Gray <nathangray.bsc@gmail.com>
Date: Tue, 4 Sep 2012 22:39:15 +0000
Subject: [PATCH] Add a check & warning on mismatched encoding.  Conversion
 will happen automatically, but warn if we know it will happen.

---
 .../inc/class.importexport_import_ui.inc.php   | 18 ++++++++++++++++--
 1 file changed, 16 insertions(+), 2 deletions(-)

diff --git a/importexport/inc/class.importexport_import_ui.inc.php b/importexport/inc/class.importexport_import_ui.inc.php
index 676adbda4b..f243bfe891 100644
--- a/importexport/inc/class.importexport_import_ui.inc.php
+++ b/importexport/inc/class.importexport_import_ui.inc.php
@@ -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');");