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

diff --git a/Changelog b/Changelog
index 9a5e657e8da39cfbaa62dba78e8628c76a57d6b9..380227aa72098fb99af5c2a8563c7e3562969736 100644 (file)
--- 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 6bc4a3ca4c80f519715097320db84c9fbfc2cad0..5ab60813c62ac43ca2c8fcfff34c5a0dfea228e4 100644 (file)
--- 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 18e55fa6d2810d93dba2bdddaa582aa711c49b60..327e947b6ce1051ae6ef529c22151a8420e2729e 100644 (file)
--- 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"));
       }
     }