using sq_is8bit function instead of ereg. Code reuse and fixes some problems

[squirrelmail.git] / functions / decode / cp1251.php

diff --git a/functions/decode/cp1251.php b/functions/decode/cp1251.php
index 91763f84645550445958c1c35c8df4750a9985d4..5ac43697b5c35c02224604a24e7fea866204cd82 100644 (file)
--- a/functions/decode/cp1251.php
+++ b/functions/decode/cp1251.php
@@ -1,9 +1,8 @@
 <?php
 /**
  * decode/cp1251.php
- * $Id$
  *
- * Copyright (c) 2003 The SquirrelMail Project Team
+ * Copyright (c) 2003-2004 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
  * This file contains cp1251 decoding function that is needed to read
@@ -18,6 +17,8 @@
  *   Table format:  Format A
  *   Date:          04/15/98
  *   Contact:       cpxlate@microsoft.com
+ *
+ * @version $Id$
  * @package squirrelmail
  * @subpackage decode
  */
@@ -33,9 +34,8 @@ function charset_decode_cp1251 ($string) {
     if (strtolower($default_charset) == 'windows-1251')
         return $string;
 
-    /* Only do the slow convert if there are 8-bit characters */
-    /* avoid using 0xA0 (\240) in ereg ranges. RH73 does not like that */
-    if (! ereg("[\200-\237]", $string) and ! ereg("[\241-\377]", $string) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'windows-1251'))
         return $string;
 
     $cp1251 = array(