phpDocumentor updates

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

diff --git a/functions/decode/iso_8859_1.php b/functions/decode/iso_8859_1.php
index e353d3e0f7995eee885a083990bb177a44bc0512..7a3e5bbc1f1fc93866a6460cb0e4d58a604b5a8e 100644 (file)
--- a/functions/decode/iso_8859_1.php
+++ b/functions/decode/iso_8859_1.php
@@ -1,13 +1,14 @@
 <?php
 <?php

+

 /**
  * decode/iso8859-1.php
 /**
  * decode/iso8859-1.php

- * $Id$
- *
- * Copyright (c) 2003-2004 The SquirrelMail Project Team
- * Licensed under the GNU GPL. For full terms see the file COPYING.

  *
  * This file contains iso-8859-1 decoding function that is needed to read
  * iso-8859-1 encoded mails in non-iso-8859-1 locale.
  *
  * This file contains iso-8859-1 decoding function that is needed to read
  * iso-8859-1 encoded mails in non-iso-8859-1 locale.

+ *
+ * @copyright &copy; 2003-2005 The SquirrelMail Project Team
+ * @license http://opensource.org/licenses/gpl-license.php GNU Public License
+ * @version $Id$

  * @package squirrelmail
  * @subpackage decode
  */
  * @package squirrelmail
  * @subpackage decode
  */


@@ -18,14 +19,8 @@
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_1 ($string) {
  * @return string $string Decoded string
  */
 function charset_decode_iso_8859_1 ($string) {

-    global $default_charset;
-
-    if (strtolower($default_charset) == 'iso-8859-1')
-        return $string;
-
-    /* Only do the slow convert if there are 8-bit characters */
-    /* there is no 0x80-0x9F letters in ISO8859-* */
-    if ( ! ereg("[\241-\377]", $string) )
+    // don't do decoding when there are no 8bit symbols
+    if (! sq_is8bit($string,'iso-8859-1'))

         return $string;
 
     $string = preg_replace("/([\201-\237])/e","'&#' . ord('\\1') . ';'",$string);
         return $string;
 
     $string = preg_replace("/([\201-\237])/e","'&#' . ord('\\1') . ';'",$string);


@@ -37,4 +32,4 @@ function charset_decode_iso_8859_1 ($string) {
     return $string;
 }
 
     return $string;
 }
 

-?>
+?>
\ No newline at end of file