Updated mail method kolab22 acls

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

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab22.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab22.inc
index 142573c8a76508f2916166c08cbc116dd9f82a67..8b45346ff560a2ec154eb245cfec4ecf1cd55022 100644 (file)
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab22.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab22.inc
@@ -21,14 +21,43 @@ class mailMethodKolab22 extends mailMethodKolab
   protected $shareObjectClasses = array("kolabSharedFolder");
 
   protected $acl_map = array(
-      "lrs"           => "read",
-      "lrsp"          => "post",
-//      "p"             => "external post",
-      "lrsip"         => "append",
-      "lrswipkxte"    => "write",
-      "lrxte"         => "delete",
-      "lrswipkxtecda" => "admin",
-      " "             => "none");
+//     "lrs"           => "read",
+//     "lrsp"          => "post",
+//     "lrsip"         => "append",
+//     "lrswipkxte"    => "write",
+//     "lrxte"         => "delete",
+//     "lrswipkxtecda" => "admin",
+//     " "             => "none");
+"none"             => "none",
+"post"             => "post",             
+"read"             => "read",
+"read/post"        => "read/post",
+"append"           => "append",
+"write"            => "write",
+"read anon"        => "read anon",
+"read anon/post"   => "read anon/post",
+"read hidden"      => "read hidden",
+"read hidden/post" => "read hidden/post",
+"all"              => "all");
+
+  /*! \brief  Returns configured acls
+   */
+  public function  getFolderACLs($ldap_acls)
+  {
+    $this->reset_error();
+    $imap_acls = mailMethodKolab::getFolderACLs(array());
+
+    foreach($imap_acls as $user => $acl){
+      if(!isset($ldap_acls[$user])){
+        $ldap_acls[$user] = $acl;
+      }else{
+        // Ldap attributes come first in kolab22.
+      }
+    }
+
+    return($ldap_acls);
+  }
+
 
   /*! \brief Returns a list of configured mail domains 
       @return Array A list of mail domains