Updated mail methods.

[gosa.git] / gosa-plugins / mail / personal / mail / class_mail-methods-cyrus.inc

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 9152a660b5e8844023079704e6b8d683b3f26b23..8816e39fb5a7657c2b39e98127006b04d3f3d337 100644 (file)
--- a/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods-cyrus.inc
@@ -36,7 +36,7 @@ class mailMethodCyrus extends mailMethod{
     mailMethod::connect();
 
     if(!count($this->ServerList)){
-      $this->error = _("There are no imap compatible mail servers defined!");
+      $this->error = _("There are no IMAP compatible mail servers defined!");
       @DEBUG (DEBUG_MAIL, __LINE__, __FUNCTION__, __FILE__,
           "<b>IMAP: No mail servers configured, check systems->server->service->imap.</b>","");
       return(FALSE);
@@ -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){