Added dhcp plugin to general include list

[gosa.git] / include / class_mail-methods-kolab.inc

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index 0ab22b92f6f4849b6832c74fd8ae594a14a98271..b43c10ad12cb8984c7db9c5779d241cacd38d6d6 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -101,6 +101,12 @@ class mailMethodKolab extends mailMethodCyrus
         $mailObject->attrs[$dest]= $mailObject->attrs[$source];
         $mailObject->$dest=        $mailObject->attrs[$source];
 
+        /* Ensure that cleanup will recognize the ampped attributes too */
+        if(isset($mailObject->saved_attributes)){
+          $mailObject->saved_attributes[$dest] = $mailObject->attrs[$source];
+          $mailObject->saved_attributes[$source] = $mailObject->attrs[$source];
+        }
+
         unset ($mailObject->$dest['count']);
         unset ($mailObject->attrs[$source]);
       }
@@ -204,7 +210,7 @@ class mailMethodKolab extends mailMethodCyrus
       }
  
       /* Save shared folder target */
-      $mailObject->attrs['gosaSharedFolderTarget']= "kolab+shared.".$mailObject->uid;
+      $mailObject->attrs['gosaSharedFolderTarget']= "kolab+shared.".$mailObject->mail;
 
       /* Kolab shared folder names are like ' shared.uid@server.de ' 
         So overwrite uid to match these folder names. Else we can't read quota settings etc.