Fixed mail method kolab account removement.

Fixed conenctivity Kolab free busy url check

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

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index cb649748d63a6d55b436fc3e4ec3a66845200395..0d1c7b98a8bff75507669335fc13a9815d3d9b10 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -44,11 +44,6 @@ class mailMethodKolab extends mailMethodCyrus
     return (TRUE);
   }
 
-  function deleteMailbox($folder)
-  {
-    return (TRUE);
-  }
-
   /* return all folders of the users mailbox*/
   function getMailboxList($folder, $uid= "")
   {
@@ -286,6 +281,12 @@ class mailMethodKolab extends mailMethodCyrus
     /* Only add kolab delete Flag in case of an user.mailAccount */
     if(!in_array("posixGroup", $mailObject->attrs['objectClass'])){
       $mailObject->attrs['kolabDeleteFlag']= preg_replace('%imap://%', '', $mailObject->gosaMailServer);
+    }else{
+      /* 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. 
+        #FIXME is there a better way to detect if it is 'shared.' or 'shared+' or 'kolab+shared.' or what ever ?*/
+      $mailObject->uid = "shared.".$mailObject->uid."@".preg_replace("/^.*@/","",$mailObject->mail);
+      
     }
   }
 

diff --git a/plugins/personal/connectivity/class_kolabAccount.inc b/plugins/personal/connectivity/class_kolabAccount.inc
index 080a498b248b7754164f8b57d62c6fe3c41d6635..272e8f2aeeff591ca43827b7e7382c8796c2bcfa 100644 (file)
--- a/plugins/personal/connectivity/class_kolabAccount.inc
+++ b/plugins/personal/connectivity/class_kolabAccount.inc
@@ -280,14 +280,14 @@ class kolabAccount extends plugin
     $message= plugin::check();
 
     /* FBFuture is in days... */
-    if ($this->kolabFreeBusyFuture != "" && !preg_match('/^[0-9]+$/', $this->kolabFreeBusyFuture)){
+    if (!empty($this->kolabFreeBusyFuture) && !preg_match('/^[0-9]+$/', $this->kolabFreeBusyFuture)){
       $message[]= _("The value specified as Free Busy future needs to be an integer.");
     }
 
-    /* Check for URL scheme... */
-    if ($this->calFBURL != "" && !@preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
-      $message[]= _("The value specified as Free Busy Information URL is invalid.");
-    }
+#    /* Check for URL scheme... */
+#    if ($this->calFBURL != "" && !@preg_match('/^[^:/]+://[a-z0-9_/.+~-]+$/i', $this->calFBURL)){
+#      $message[]= _("The value specified as Free Busy Information URL is invalid.");
+#    }
 
     /* Check invitation policy for existing mail addresses */
     foreach($this->kolabInvitationPolicy as $policy){