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 6bb0f2dfa21d415ff73a139137f2d53d7506e003..6c856e79a3c39303e6e015ca68a1a3c3f809431f 100644 (file)
--- 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 9eb683c7408dfa1affc5323595988dc69e1ca340..f87faa424fb27f19f6b7bbb08662c9dcd405f46f 100644 (file)
--- 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 73a91be74542d2229c8f411ca8b78720a7e3da92..e7b94b3734c4a6f2b314fb1f2e16151d3d35054d 100644 (file)
--- 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();