--- functions/i18n.php.orig	Thu Jun  3 20:28:57 2004
+++ functions/i18n.php	Thu Jun  3 20:44:14 2004
@@ -88,16 +88,20 @@
         }
     } else if ($charset == 'ns_4551-1') {
         $ret = charset_decode_ns_4551_1 ($string);
-    } else if ($charset == 'koi8-r') {
+//    } else if ($charset == 'koi8-r') {
+    } else if (($charset == 'koi8-r') or ($charset == 'koi8-ru') or ($charset == 'koi8r') or
+        ($charset == 'koi8') or ($charset == 'cskoi8r')) {
         include_once(SM_PATH . 'functions/decode/koi8-r.php');
         $ret = charset_decode_koi8r ($string);
-    } else if ($charset == 'koi8-u') {
+//    } else if ($charset == 'koi8-u') {
+    } else if (($charset == 'koi8-u') or ($charset == 'koi8-ua')) {
         include_once(SM_PATH . 'functions/decode/koi8-u.php');
         $ret = charset_decode_koi8u ($string);
     } else if ($charset == 'windows-1250') {
         include_once(SM_PATH . 'functions/decode/cp1250.php');
         $ret = charset_decode_cp1250 ($string);
-    } else if ($charset == 'windows-1251') {
+//    } else if ($charset == 'windows-1251') {
+    } else if (($charset == 'windows-1251') or ($charset == 'cp1251')) {
         include_once(SM_PATH . 'functions/decode/cp1251.php');
         $ret = charset_decode_cp1251 ($string);
     } else if ($charset == 'windows-1252') {
@@ -127,7 +131,8 @@
     } else if ($charset == 'x-mac-greek') {
         include_once(SM_PATH . 'functions/decode/cp10006.php');
         $ret = charset_decode_cp10006 ($string);
-    } else if ($charset == 'x-mac-cyrillic') {
+//    } else if ($charset == 'x-mac-cyrillic') {
+    } else if (($charset == 'x-mac-cyrillic') or ($charset == 'maccyrillic') or ($charset == 'mac-cyrillic')) {
         include_once(SM_PATH . 'functions/decode/cp10007.php');
         $ret = charset_decode_cp10007 ($string);
     } else if ($charset == 'x-mac-ukrainian') {
@@ -145,7 +150,9 @@
     } else if ($charset == 'ibm855') {
         include_once(SM_PATH . 'functions/decode/cp855.php');
         $ret = charset_decode_cp855 ($string);
-    } else if ($charset == 'ibm866') {
+//    } else if ($charset == 'ibm866') {
+    } else if (($charset == '866') or ($charset == 'cp866') or ($charset == 'cp-866') or
+        ($charset == 'x-cp866') or ($charset == 'csibm866') or ($charset == 'ibm866')) {
         include_once(SM_PATH . 'functions/decode/cp866.php');
         $ret = charset_decode_cp866 ($string);
     } else if ($charset == 'iso-ir-111') {