Reverted changes from 3871 on. They did not work - even if I

[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 1f785a06390ff907968de9c6779e474b06f7a5a3..95ba9e5ee3e60959ddc3f6f1f8530ed910c249d9 100644 (file)
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -44,49 +44,49 @@ class mailMethodKolab extends mailMethodCyrus
     return (TRUE);
   }
 
+  function deleteMailbox($folder)
+  {
+    return (TRUE);
+  }
+
+
+  /* Get quota and divide it by 1024, because in gosa we display in MB
+      but we get Kb */
   function getQuota($folder)
   {
     $result= array('quotaUsage' => '', 'gosaMailQuota' => '');
 
+    error_reporting(0);  
+  
     /* Load quota settings */
-    $folder = $folder;
-
-    /* try to read quota with style of users
-       user/name@server.de
-     */
-    $quota_value = @imap_get_quota($this->mbox, str_replace("user.","user/",$folder));
-
-    /* If obove method failed, try to read quota with style of users
-       user.name@server.de
-     */
-    if(!is_array($quota_value)){
-      $quota_value = @imap_get_quota($this->mbox, $folder);
-    }
-
+    $quota_value = @imap_get_quota($this->mbox, $folder);
     if(is_array($quota_value)) {
       if (isset($quota_value["STORAGE"]) && is_array($quota_value["STORAGE"])){
         /* use for PHP >= 4.3 */
-        $result['quotaUsage']=    ($quota_value["STORAGE"]['usage'] / 1024);
-        $result['gosaMailQuota']= ($quota_value["STORAGE"]['limit'] / 1024);
+        $result['quotaUsage']=    (int) ($quota_value["STORAGE"]['usage'] / 1024);
+        $result['gosaMailQuota']= (int) ($quota_value["STORAGE"]['limit'] / 1024);
       } else {
         /* backward icompatible */
-        $result['quotaUsage']=    ($quota_value['usage'] / 1024);
-        $result['gosaMailQuota']= ($quota_value['limit'] / 1024);
+        $result['quotaUsage']=    (int) ($quota_value['usage'] / 1024);
+        $result['gosaMailQuota']= (int) ($quota_value['limit'] / 1024);
       }
+    }elseif(!$quota_value){
+      return(false);
     }
-    return ($result);
-  }
 
-
-
-  function deleteMailbox($folder)
-  {
-    return (TRUE);
+    error_reporting(E_ALL); 
+ 
+    return ($result);
   }
 
 
   function fixAttributesOnLoad(&$mailObject)
   {
+    /* 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);
+
     /* Convert attributes and objectClasses */
     foreach ($this->attribute_map as $dest => $source){
       /* Hickert 11.11.05 : Alternate email addresses were saved, but not displayed again.
@@ -118,6 +118,12 @@ class mailMethodKolab extends mailMethodCyrus
   function fixAttributesOnStore(&$mailObject)
   {
     global $config;
+  
+    /* If quota is empty, remove quota restrictions by setting quota to 0 */
+    if(isset($mailObject->gosaMailQuota) && (empty($mailObject->gosaMailQuota))){
+      $mailObject->attrs['gosaMailQuota'] = 0;
+    }
+
     /* Convert attributes and objectClasses */
     foreach ($this->attribute_map as $source => $dest){
       if (isset($mailObject->attrs[$source])){
@@ -195,6 +201,14 @@ class mailMethodKolab extends mailMethodCyrus
           }
         }
       }
+ 
+      /* Save shared folder target */
+      $mailObject->attrs['gosaSharedFolderTarget']= "kolab+shared.".$mailObject->uid;
+
+      /* 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);
   
       /* Assign new acls */
       $mailObject->attrs['acl']= array();
@@ -218,7 +232,7 @@ class mailMethodKolab extends mailMethodCyrus
     foreach($this->attribute_map as $kolabAttr){
       $mailObject->attrs[$kolabAttr] = array();
     }  
-    //$mailObject->attrs['kolabDeleteFlag']= preg_replace('%imap://%', '', $mailObject->gosaMailServer);
+    $mailObject->attrs['kolabDeleteFlag']= preg_replace('%imap://%', '', $mailObject->gosaMailServer);
   }
 
 }