X-Git-Url: https://vcs.fsf.org/?a=blobdiff_plain;f=functions%2Fimap_utf7_local.php;h=9a15db9b21814e3c6e5f079e14ffebaa6a5ab6c5;hb=bdd7ec2e489211ddcc5b10a7880aa557a4e29d0b;hp=7845792795bc17a4833c6611ac3ea7c12b190940;hpb=8b35c78ed36903fb4a3e9cfeea7198d58061f38b;p=squirrelmail.git

diff --git a/functions/imap_utf7_local.php b/functions/imap_utf7_local.php
index 78457927..9a15db9b 100644
--- a/functions/imap_utf7_local.php
+++ b/functions/imap_utf7_local.php
@@ -1,16 +1,39 @@
 <?php
 
 /**
- * imap_general.php
+ * imap_utf7_local.php
  *
  * Copyright (c) 1999-2003 The SquirrelMail Project Team
  * Licensed under the GNU GPL. For full terms see the file COPYING.
  *
- * This implements all functions that do general imap functions.
+ * This implements all functions that do imap UTF7 conversions.
  *
- * $Id $
+ * $Id$
+ * @package squirrelmail
  */
 
+/**
+ * @param string $str
+ * @param string $to_encoding
+ * @param string $from_encoding
+ * @param string $default_charset
+ * @return string
+ */
+function sqimap_mb_convert_encoding($str, $to_encoding, $from_encoding, $default_charset)
+{
+  // Allows mbstring functions only with iso-8859-*, utf-8 and 
+  // iso-2022-jp (Japanese)
+  // koi8-r and gb2312 can be added only in php 4.3+
+  if ( stristr($default_charset, 'iso-8859-') ||
+       stristr($default_charset, 'utf-8') || 
+       stristr($default_charset, 'iso-2022-jp') ) {
+    if (function_exists('mb_convert_encoding')) {
+      return mb_convert_encoding($str, $to_encoding, $from_encoding);
+    }
+  }
+  return '';
+}
+
 function imap_utf7_encode_local($s) {
     global $languages, $squirrelmail_language;
     
@@ -19,20 +42,15 @@ function imap_utf7_encode_local($s) {
         return $languages[$squirrelmail_language]['XTRA_CODE']('utf7-imap_encode', $s);
     }
 
-    global $default_charset;
-    set_my_charset();
+    if ($s == '')  //If empty, don't bother
+      return '';
 
-    if ( ! $default_charset == "iso-8859-1" ) {
-      // Allows mbstring functions only with iso-8859-*, utf-8 and 
-      // iso-2022-jp (Japanese)
-      // koi8-r and gb2312 can be added only in php 4.3+
-      if ( preg_match("/iso-8859-/i",$default_charset) ||
-	   preg_match("/utf-8/i",$default_charset) || 
-	   preg_match("/iso-2022-jp/i",$default_charset) ) {
-	if(function_exists("mb_convert_encoding")) {
-	  return mb_convert_encoding($s, "UTF7-IMAP", $default_charset);
-	}
-      }
+    global $default_charset;
+    set_my_charset();	//must be called before using $default_charset
+    if ((strtolower($default_charset) != 'iso-8859-1') && ($default_charset != '')) {
+      $utf7_s = sqimap_mb_convert_encoding($s, 'UTF7-IMAP', $default_charset, $default_charset);
+      if ($utf7_s != '')
+        return $utf7_s;
     }
 
     // Later code works only for ISO-8859-1 
@@ -77,20 +95,15 @@ function imap_utf7_decode_local($s) {
         return $languages[$squirrelmail_language]['XTRA_CODE']('utf7-imap_decode', $s);
     }
 
-    global $default_charset;
-    set_my_charset();
+    if ($s == '')  //If empty, don't bother
+      return '';
 
-    if ( ! $default_charset == "iso-8859-1" ) {
-      // Allows mbstring functions only with iso-8859-*, utf-8 and 
-      // iso-2022-jp (Japanese)
-      // koi8-r and gb2312 can be added only in php 4.3+
-      if ( preg_match("/iso-8859-/i",$default_charset) ||
-	   preg_match("/utf-8/i",$default_charset) || 
-	   preg_match("/iso-2022-jp/i",$default_charset) ) {
-	if(function_exists("mb_convert_encoding")) {
-	  return mb_convert_encoding($s, $default_charset, "UTF7-IMAP");
-	}
-      }
+    global $default_charset;
+    set_my_charset();	//must be called before using $default_charset
+    if ((strtolower($default_charset) != 'iso-8859-1') && ($default_charset != '')) {
+      $utf7_s = sqimap_mb_convert_encoding($s, $default_charset, 'UTF7-IMAP', $default_charset);
+      if ($utf7_s != '')
+        return $utf7_s;
     }
 
     // Later code works only for ISO-8859-1
@@ -209,4 +222,4 @@ function decodeBASE64($s) {
 	return $d;
 }
 
-?>
\ No newline at end of file
+?>