From 8792664e4eed5f5842697250a16087b19dccfaa6 Mon Sep 17 00:00:00 2001
From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 18 Dec 2008 12:10:28 +0000
Subject: [PATCH] Updated mail methods

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@13318 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 gosa-plugins/mail/admin/groups/mail/class_groupMail.inc   | 2 +-
 .../mail/personal/mail/class_mail-methods-cyrus.inc       | 8 +++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 3965203a2..4db272f2f 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -59,7 +59,7 @@ class mailgroup extends plugin
         $this->$attr = $this->attrs[$attr][0];
       }
     }
-    $this->orig_cn = $this->cn;
+    $this->orig_cn = $this->uid = $this->cn;
 
     /* Intialize the used mailMethod
      */
diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
index 9152a660b..890d08fc7 100644
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -305,10 +305,16 @@ class mailMethodCyrus extends mailMethod{
 
     /* Contact imap server */
     $list = @imap_listmailbox($this->imap_handle, $cfg["connect"], $this->account_id);
-    $list = array_merge($list,@imap_listmailbox($this->imap_handle, $cfg["connect"], $search));
+    $list2 = @imap_listmailbox($this->imap_handle, $cfg["connect"], $search);
 
     /* Create list of returned folder names */
     if (is_array($list)){
+
+      /* Merge in subfolders */
+      if(is_array($list2)){
+        $list = array_merge($list,$list2);
+      }
+
       foreach ($list as $val){
         $str = trim(preg_replace("/^\{[^\}]*+\}/","",$val));
         if($with_domain){
-- 
2.30.2