Remove shared folders via imap_delete.

KolabD is currently not able to remove shared folder accouts.

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

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index 0cd0e15be64829935b1086e24253cfb146265ae5..0ab22b92f6f4849b6832c74fd8ae594a14a98271 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -246,6 +246,16 @@ class mailMethodKolab extends mailMethodCyrus
     }
   }
 
+
+  function deleteMailbox($folder)
+  {
+    /* Remove shared folders and skip removing users. 
+       KolabD is not able to remove shared folders yet, so we do it instead */
+    if(preg_match("/^shared/",$folder)){
+      return mailMethodCyrus::deleteMailbox($folder);
+    }
+    return (TRUE);
+  }
 }
 
 // vim:tabstop=2:expandtab:shiftwidth=2:filetype=php:syntax:ruler:

diff --git a/plugins/personal/mail/class_mailAccount.inc b/plugins/personal/mail/class_mailAccount.inc
index b8c78b802a4d2c856f5dac58d5609d48f0f7f94a..fd2d0ceeef2e2be7a870f1ef8c53096ea19be99c 100644 (file)
--- a/plugins/personal/mail/class_mailAccount.inc
+++ b/plugins/personal/mail/class_mailAccount.inc
@@ -43,7 +43,7 @@ class mailAccount extends plugin
   var $quotaUsage                         = 0;
   var $forward_dialog                     = FALSE;
   var $folder_prefix                      = "";
-  var $mailboxList                        = array();
+  var $mailboxList                        = array("INBOX");
   var $default_permissions                = "none";
   var $member_permissions                 = "post";
   var $members                            = array();