projects
/
squirrelmail.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
using sq_is8bit function instead of ereg. Code reuse and fixes some problems
[squirrelmail.git]
/
functions
/
decode
/
iso_ir_111.php
diff --git
a/functions/decode/iso_ir_111.php
b/functions/decode/iso_ir_111.php
index 0842540b253b2d908f51ae1151b463812beb60a0..d610e86ac22448f562e166d2979d3066280024e5 100644
(file)
--- a/
functions/decode/iso_ir_111.php
+++ b/
functions/decode/iso_ir_111.php
@@
-1,7
+1,6
@@
<?php
/**
* decode/iso-ir-111.php
<?php
/**
* decode/iso-ir-111.php
- * $Id$
*
* Copyright (c) 2003-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
*
* Copyright (c) 2003-2004 The SquirrelMail Project Team
* Licensed under the GNU GPL. For full terms see the file COPYING.
@@
-40,6
+39,7
@@
* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
* OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR
* THE USE OR OTHER DEALINGS IN THE SOFTWARE.
*
+ * @version $Id$
* @package squirrelmail
* @subpackage decode
*/
* @package squirrelmail
* @subpackage decode
*/
@@
-55,113
+55,111
@@
function charset_decode_iso_ir_111 ($string) {
if (strtolower($default_charset) == 'iso-ir-111')
return $string;
if (strtolower($default_charset) == 'iso-ir-111')
return $string;
- /* Only do the slow convert if there are 8-bit characters */
- /* there is no 0x80-0x9F letters in ISO-IR-111 */
- if ( ! ereg("[\241-\377]", $string) )
+ // don't do decoding when there are no 8bit symbols
+ if (! sq_is8bit($string,'iso-ir-111'))
return $string;
$iso_ir_111 = array(
return $string;
$iso_ir_111 = array(
- "\xA0" => ' ',
- "\xA1" => 'ђ',
- "\xA2" => 'ѓ',
- "\xA3" => 'ё',
- "\xA4" => 'є',
- "\xA5" => 'ѕ',
- "\xA6" => 'і',
- "\xA7" => 'ї',
- "\xA8" => 'ј',
- "\xA9" => 'љ',
- "\xAA" => 'њ',
- "\xAB" => 'ћ',
- "\xAC" => 'ќ',
- "\xAD" => '­',
- "\xAE" => 'ў',
- "\xAF" => 'џ',
- "\xB0" => '№',
- "\xB1" => 'Ђ',
- "\xB2" => 'Ѓ',
- "\xB3" => 'Ё',
- "\xB4" => 'Є',
- "\xB5" => 'Ѕ',
- "\xB6" => 'І',
- "\xB7" => 'Ї',
- "\xB8" => 'Ј',
- "\xB9" => 'Љ',
- "\xBA" => 'Њ',
- "\xBB" => 'Ћ',
- "\xBC" => 'Ќ',
- "\xBD" => '¤',
- "\xBE" => 'Ў',
- "\xBF" => 'Џ',
- "\xC0" => 'ю',
- "\xC1" => 'а',
- "\xC2" => 'б',
- "\xC3" => 'ц',
- "\xC4" => 'д',
- "\xC5" => 'е',
- "\xC6" => 'ф',
- "\xC7" => 'г',
- "\xC8" => 'х',
- "\xC9" => 'и',
- "\xCA" => 'й',
- "\xCB" => 'к',
- "\xCC" => 'л',
- "\xCD" => 'м',
- "\xCE" => 'н',
- "\xCF" => 'о',
- "\xD0" => 'п',
- "\xD1" => 'я',
- "\xD2" => 'р',
- "\xD3" => 'с',
- "\xD4" => 'т',
- "\xD5" => 'у',
- "\xD6" => 'ж',
- "\xD7" => 'в',
- "\xD8" => 'ь',
- "\xD9" => 'ы',
- "\xDA" => 'з',
- "\xDB" => 'ш',
- "\xDC" => 'э',
- "\xDD" => 'щ',
- "\xDE" => 'ч',
- "\xDF" => 'ъ',
- "\xE0" => 'Ю',
- "\xE1" => 'А',
- "\xE2" => 'Б',
- "\xE3" => 'Ц',
- "\xE4" => 'Д',
- "\xE5" => 'Е',
- "\xE6" => 'Ф',
- "\xE7" => 'Г',
- "\xE8" => 'Х',
- "\xE9" => 'И',
- "\xEA" => 'Й',
- "\xEB" => 'К',
- "\xEC" => 'Л',
- "\xED" => 'М',
- "\xEE" => 'Н',
- "\xEF" => 'О',
- "\xF0" => 'П',
- "\xF1" => 'Я',
- "\xF2" => 'Р',
- "\xF3" => 'С',
- "\xF4" => 'Т',
- "\xF5" => 'У',
- "\xF6" => 'Ж',
- "\xF7" => 'В',
- "\xF8" => 'Ь',
- "\xF9" => 'Ы',
- "\xFA" => 'З',
- "\xFB" => 'Ш',
- "\xFC" => 'Э',
- "\xFD" => 'Щ',
- "\xFE" => 'Ч',
- "\xFF" => 'Ъ'
+
"\xA0" => ' ',
+
"\xA1" => 'ђ',
+
"\xA2" => 'ѓ',
+
"\xA3" => 'ё',
+
"\xA4" => 'є',
+
"\xA5" => 'ѕ',
+
"\xA6" => 'і',
+
"\xA7" => 'ї',
+
"\xA8" => 'ј',
+
"\xA9" => 'љ',
+
"\xAA" => 'њ',
+
"\xAB" => 'ћ',
+
"\xAC" => 'ќ',
+
"\xAD" => '­',
+
"\xAE" => 'ў',
+
"\xAF" => 'џ',
+
"\xB0" => '№',
+
"\xB1" => 'Ђ',
+
"\xB2" => 'Ѓ',
+
"\xB3" => 'Ё',
+
"\xB4" => 'Є',
+
"\xB5" => 'Ѕ',
+
"\xB6" => 'І',
+
"\xB7" => 'Ї',
+
"\xB8" => 'Ј',
+
"\xB9" => 'Љ',
+
"\xBA" => 'Њ',
+
"\xBB" => 'Ћ',
+
"\xBC" => 'Ќ',
+
"\xBD" => '¤',
+
"\xBE" => 'Ў',
+
"\xBF" => 'Џ',
+
"\xC0" => 'ю',
+
"\xC1" => 'а',
+
"\xC2" => 'б',
+
"\xC3" => 'ц',
+
"\xC4" => 'д',
+
"\xC5" => 'е',
+
"\xC6" => 'ф',
+
"\xC7" => 'г',
+
"\xC8" => 'х',
+
"\xC9" => 'и',
+
"\xCA" => 'й',
+
"\xCB" => 'к',
+
"\xCC" => 'л',
+
"\xCD" => 'м',
+
"\xCE" => 'н',
+
"\xCF" => 'о',
+
"\xD0" => 'п',
+
"\xD1" => 'я',
+
"\xD2" => 'р',
+
"\xD3" => 'с',
+
"\xD4" => 'т',
+
"\xD5" => 'у',
+
"\xD6" => 'ж',
+
"\xD7" => 'в',
+
"\xD8" => 'ь',
+
"\xD9" => 'ы',
+
"\xDA" => 'з',
+
"\xDB" => 'ш',
+
"\xDC" => 'э',
+
"\xDD" => 'щ',
+
"\xDE" => 'ч',
+
"\xDF" => 'ъ',
+
"\xE0" => 'Ю',
+
"\xE1" => 'А',
+
"\xE2" => 'Б',
+
"\xE3" => 'Ц',
+
"\xE4" => 'Д',
+
"\xE5" => 'Е',
+
"\xE6" => 'Ф',
+
"\xE7" => 'Г',
+
"\xE8" => 'Х',
+
"\xE9" => 'И',
+
"\xEA" => 'Й',
+
"\xEB" => 'К',
+
"\xEC" => 'Л',
+
"\xED" => 'М',
+
"\xEE" => 'Н',
+
"\xEF" => 'О',
+
"\xF0" => 'П',
+
"\xF1" => 'Я',
+
"\xF2" => 'Р',
+
"\xF3" => 'С',
+
"\xF4" => 'Т',
+
"\xF5" => 'У',
+
"\xF6" => 'Ж',
+
"\xF7" => 'В',
+
"\xF8" => 'Ь',
+
"\xF9" => 'Ы',
+
"\xFA" => 'З',
+
"\xFB" => 'Ш',
+
"\xFC" => 'Э',
+
"\xFD" => 'Щ',
+
"\xFE" => 'Ч',
+
"\xFF" => 'Ъ'
);
$string = str_replace(array_keys($iso_ir_111), array_values($iso_ir_111), $string);
return $string;
}
);
$string = str_replace(array_keys($iso_ir_111), array_values($iso_ir_111), $string);
return $string;
}
-
-?>
+?>
\ No newline at end of file