X-Git-Url: https://git.tokkee.org/?a=blobdiff_plain;f=include%2Fclass_mail-methods-kolab.inc;h=04027c38873ed3fda977105778067d7069357eeb;hb=f26ba868f04f17cee7e26921d0fd977a4632bfdb;hp=0ab22b92f6f4849b6832c74fd8ae594a14a98271;hpb=4dfc2b514b0f02c1762904e97bb07602c60ef7c9;p=gosa.git

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index 0ab22b92f..04027c388 100644
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -30,7 +30,7 @@ class mailMethodKolab extends mailMethodCyrus
                             "gosaMailQuota"             =>  "cyrus-userquota",
                             "gosaMailServer"            =>  "kolabHomeServer");
 
-  function mailMethodKolab($config)
+  function mailMethodKolab(&$config)
   {
     $this->config= $config->data['SERVERS']['IMAP'];
   }
@@ -73,7 +73,7 @@ class mailMethodKolab extends mailMethodCyrus
       return(false);
     }
 
-    error_reporting(E_ALL); 
+    error_reporting(E_ALL | E_STRICT); 
  
     return ($result);
   }
@@ -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.