Search CYRUSUNIXSTYLE in current location and in main

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@4139 594d385d-05f5-0310-b6e9-bd551577e9d8

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index ccab73185e972f58ea1e8578f7490a88566d2e23..fd5f367e9fa2fa9b709144df394874106a8f4d01 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -95,12 +95,13 @@ class mailAccount extends plugin
     /* Create the account prefix  user. user/ 
        Preset folder prefix. Will change it later to respect
        altnamespace. */
-    if (isset($this->config->current['CYRUSUNIXSTYLE']) && $this->config->current['CYRUSUNIXSTYLE'] == "true"){
+    if (!isset($this->config->current['CYRUSUNIXSTYLE']) && $this->config->current['CYRUSUNIXSTYLE'] == "true"){
+      $this->folder_prefix= "user/";
+    }elseif (isset($this->config->data['MAIN']['CYRUSUNIXSTYLE']) && $this->config->data['MAIN']['CYRUSUNIXSTYLE'] == "true"){
       $this->folder_prefix= "user/";
     } else {
       $this->folder_prefix= "user.";
     }
-
     
     /* This is not a new account, parse additional attributes */
     if (($dn != NULL) && ($dn != "new") && $this->is_account){