From 20a260246f223d99a386c7434e2eac21897df5ff Mon Sep 17 00:00:00 2001
From: cajus <cajus@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 17 Oct 2007 17:03:41 +0000
Subject: [PATCH] Fixed display of non ISO names. Closes #233.

git-svn-id: https://oss.gonicus.de/repositories/gosa/branches/2.5@7587 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 Changelog                            |  1 +
 contrib/openldap/slapd.conf          | 32 ++++++++++++++++------------
 include/class_mail-methods-cyrus.inc |  2 +-
 3 files changed, 20 insertions(+), 15 deletions(-)

diff --git a/Changelog b/Changelog
index 9a5e657e8..380227aa7 100644
--- a/Changelog
+++ b/Changelog
@@ -5,6 +5,7 @@ GOsa2 changelog
   - Fixed saving of A/B networks reverse zone entries
   - Fixed problem with non loaded class_dhcpPlugin in some cases.
   - Added fglrx driver to driver list
+  - Fixed non ISO display of IMAP folder names
 
 * gosa 2.5.13
   - Fixed renaming of asterisk servers
diff --git a/contrib/openldap/slapd.conf b/contrib/openldap/slapd.conf
index 6bc4a3ca4..5ab60813c 100644
--- a/contrib/openldap/slapd.conf
+++ b/contrib/openldap/slapd.conf
@@ -210,13 +210,13 @@ rootdn	"cn=ldapadmin,dc=gonicus,dc=de"
 rootpw  {crypt}OuorOLd3VqvC2
 
 # Indexing
-index   default                                                sub
-index   uid,mail                                               eq
-index   gosaMailAlternateAddress,gosaMailForwardingAddress     eq
-index   cn,sn,givenName,ou                                     pres,eq,sub
-index   objectClass                                            pres,eq
-index   uidNumber,gidNumber,memberuid                          eq
-index   gosaSubtreeACL,gosaObject,gosaUser                     pres,eq
+index   default                                                	sub
+index   uid,mail                                               	eq
+index   gosaMailAlternateAddress,gosaMailForwardingAddress     	eq
+index   cn,sn,givenName,ou                                     	pres,eq,sub
+index   objectClass                                            	pres,eq
+index   uidNumber,gidNumber,memberuid                          	eq
+index   gosaSubtreeACL,gosaObject,gosaUser                     	pres,eq
 
 # Indexing for Kolab
 #index	alias							eq,sub
@@ -225,13 +225,17 @@ index   gosaSubtreeACL,gosaObject,gosaUser                     pres,eq
 #index  member							pres,eq
 
 # Indexing for Samba 3
-index   sambaSID                                               eq
-index   sambaPrimaryGroupSID                                   eq
-index   sambaDomainName                                        eq
-
-# Indexing for DHCP
-#index  dhcpHWAddress						eq
-#index  dhcpClassData						eq
+index   sambaSID                                               	eq
+index   sambaPrimaryGroupSID                                   	eq
+index   sambaDomainName                                        	eq
+
+# Indexing for DNS/DHCP
+#index	zoneName						eq
+#index	relativeDomainName					eq
+#index   dhcpHWAddress						eq
+#index   dhcpClassData						eq
+#index   dhcpPrimaryDN						eq
+#index   dhcpSecondaryDN						eq
 
 # Where the database file are physically stored
 directory	"/var/lib/ldap"
diff --git a/include/class_mail-methods-cyrus.inc b/include/class_mail-methods-cyrus.inc
index 18e55fa6d..327e947b6 100644
--- a/include/class_mail-methods-cyrus.inc
+++ b/include/class_mail-methods-cyrus.inc
@@ -128,7 +128,7 @@ var $uattrib= "uid";
 
         /* Cut domain name */
         $val = preg_replace("/@.*$/","",$val);
-        $result[]=preg_replace ("/^.*".normalizePreg($folder)."/","INBOX", imap_utf7_decode ($val));
+        $result[]=preg_replace ("/^.*".normalizePreg($folder)."/","INBOX", mb_convert_encoding($val, "UTF-8", "UTF7-IMAP"));
       }
     }
 
-- 
2.30.2