fix import

Author: Norbert Kuemin

admin/helpers/cvs.php

@@ -38,9 +38,8 @@ public static function saveCVS($data, $encoding, $filename, $delimiter = ';') {
 	}
 
 	public static function loadCVS($content, $encoding, $delimiter = ';') {
-		if ($encoding != "UTF-8") {
-			$content = iconv($encoding, "UTF-8"."//TRANSLIT", $content); 
-		}
+		$content = mb_convert_encoding($content, $encoding, 'Windows-1252');
+		//$content = iconv($encoding, "UTF-8"."//TRANSLIT", $content); 
 		if (substr($content,0,3) == "\357\273\277") { $content = substr($content,3); } //Remove known BOM
 		return self::cvs2array($content, $delimiter);
 	}

admin/sql/install.mysql.utf8.sql

@@ -36,7 +36,7 @@ CREATE TABLE IF NOT EXISTS `#__nokCM_persons` (
   KEY `idx_hh_person_id` (`hh_person_id`),
   KEY `idx_user_id` (`user_id`),
   KEY `idx_remote` (`name`,`firstname`,`address`,`city`,`birthday`)
-)  DEFAULT CHARSET=utf8;
+)  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `#__nokCM_memberships` (
   `id` integer NOT NULL auto_increment,
@@ -53,7 +53,7 @@ CREATE TABLE IF NOT EXISTS `#__nokCM_memberships` (
   PRIMARY KEY  (`id`),
   KEY `idx_person_id` (`person_id`),
   KEY `idx_remote` (`person_id`,`type`,`begin`)
-)  DEFAULT CHARSET=utf8;
+)  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 
 CREATE TABLE IF NOT EXISTS `#__nokCM_board` (
   `id` integer NOT NULL auto_increment,
@@ -71,5 +71,5 @@ CREATE TABLE IF NOT EXISTS `#__nokCM_board` (
   PRIMARY KEY  (`id`),
   KEY `idx_person_id` (`person_id`),
   KEY `idx_remote` (`person_id`,`job`,`begin`)
-)  DEFAULT CHARSET=utf8;
+)  DEFAULT CHARSET=utf8mb4 COLLATE=utf8mb4_unicode_ci;
 

com_clubmanagement.xml

@@ -6,7 +6,7 @@
 	<creationDate>December 2017</creationDate>
 	<copyright>(C) 2017 Norbert Kuemin</copyright>
 	<license>http://www.gnu.org/copyleft/gpl.html GNU/GPL</license>
-	<version>3.0.21</version>
+	<version>3.0.22</version>
 	<description>COM_CLUBMANAGEMENT_XML_DESC</description>
 
 	<install>