From 9cc05ace81e35ea9ea4ead8b8d4917f4e38350c6 Mon Sep 17 00:00:00 2001
From: alec <alec@208e9e7b-5314-0410-a742-e7e81cd9613c>
Date: Sun, 1 Mar 2009 08:14:14 +0000
Subject: - Support 'UNICODE-1-1-UTF-7' alias for UTF-7 encoding (#1485758)

git-svn-id: https://svn.roundcube.net/trunk@2321 208e9e7b-5314-0410-a742-e7e81cd9613c
---
 roundcubemail/program/include/main.inc | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

(limited to 'roundcubemail/program/include')

diff --git a/roundcubemail/program/include/main.inc b/roundcubemail/program/include/main.inc
index 86fe578ca..9adcd4cfc 100644
--- a/roundcubemail/program/include/main.inc
+++ b/roundcubemail/program/include/main.inc
@@ -186,6 +186,12 @@ function rcube_charset_convert($str, $from, $to=NULL)
   $to = $to==NULL ? strtoupper(RCMAIL_CHARSET) : strtoupper($to);
   $error = false; $conv = null;
 
+  # RFC1642
+  if ($from == 'UNICODE-1-1-UTF-7')
+    $from = 'UTF-7';
+  if ($to == 'UNICODE-1-1-UTF-7')
+    $to = 'UTF-7';
+
   if ($from==$to || $str=='' || empty($from))
     return $str;
     
@@ -209,7 +215,6 @@ function rcube_charset_convert($str, $from, $to=NULL)
     }
   }
 
-
   if (is_null($mbstring_loaded))
     $mbstring_loaded = extension_loaded('mbstring');
     
@@ -232,8 +237,8 @@ function rcube_charset_convert($str, $from, $to=NULL)
         return $out;
     }
   }
-    
-  
+
+  # try to convert with custom classes
   if (class_exists('utf8'))
     $conv = new utf8();
 
-- 
cgit v1.2.3