From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Wed, 1 Jul 2009 06:01:18 +0000 (+0000)
Subject: Updated mail methods
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=b496ada47c233d970d03cab303652e9efdf97d0e;p=gosa.git

Updated mail methods
-Updated usage of kolabSharedFolderTarget


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

diff --git a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
index 6bb0f2dfa..6c856e79a 100644
--- a/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
+++ b/gosa-plugins/kolab/personal/mail/kolab/class_mail-methods-kolab.inc
@@ -90,8 +90,10 @@ class mailMethodKolab extends mailMethodCyrus
     }
     $this->parent->attrs['objectClass'] = array_merge( $this->parent->attrs['objectClass'],$ocs);
     $this->parent->attrs['objectClass'] = array_unique($this->parent->attrs['objectClass']);
-    $this->parent->attrs['gosaSharedFolderTarget'] =array();
 
+    if($this->type == "group"){ 
+      $this->parent->attrs['gosaSharedFolderTarget'] =array();
+    }
 
     /* If the mail setup includes Master and Slave Kolab Server, then we have to remove the 
      *  mailAccount from server, by adding a kolabDeleteflag for each server.
diff --git a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
index 9eb683c74..f87faa424 100644
--- a/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
+++ b/gosa-plugins/mail/admin/groups/mail/class_groupMail.inc
@@ -520,7 +520,6 @@ class mailgroup extends plugin
     /* Zero arrays */
     $this->attrs['gosaMailAlternateAddress'] = array();
     $this->attrs['gosaMailForwardingAddress']= array();
-    $this->attrs['gosaSharedFolderTarget']= array();
 
     $this->mailMethod->fixAttributesOnRemove();
     $this->cleanup();
diff --git a/gosa-plugins/mail/personal/mail/class_mail-methods.inc b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
index 73a91be74..e7b94b373 100644
--- a/gosa-plugins/mail/personal/mail/class_mail-methods.inc
+++ b/gosa-plugins/mail/personal/mail/class_mail-methods.inc
@@ -199,6 +199,7 @@ class mailMethod{
     }else{
       $this->parent->attrs['objectClass'] = 
         array_remove_entries_ics($this->shareObjectClasses, $this->parent->attrs['objectClass']);
+      $this->parent->attrs['gosaSharedFolderTarget'] =array();
     }
     foreach($this->attributes as $source => $dest){
       $this->attrs[$dest]   = array();