From: hickert <hickert@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 28 Apr 2006 09:53:22 +0000 (+0000)
Subject: Removed not required kolab mailfixes. This was already implemeted with gosa.conf... 
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=6d3968d8f93942ee634b05b7898cacd54dc63cc3;p=gosa.git

Removed not required kolab mailfixes. This was already implemeted with gosa.conf flags .


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

diff --git a/include/class_mail-methods-kolab.inc b/include/class_mail-methods-kolab.inc
index 1f785a063..acb1210b3 100644
--- a/include/class_mail-methods-kolab.inc
+++ b/include/class_mail-methods-kolab.inc
@@ -44,41 +44,6 @@ class mailMethodKolab extends mailMethodCyrus
     return (TRUE);
   }
 
-  function getQuota($folder)
-  {
-    $result= array('quotaUsage' => '', 'gosaMailQuota' => '');
-
-    /* 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);
-    }
-
-    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);
-      } else {
-        /* backward icompatible */
-        $result['quotaUsage']=    ($quota_value['usage'] / 1024);
-        $result['gosaMailQuota']= ($quota_value['limit'] / 1024);
-      }
-    }
-    return ($result);
-  }
-
-
-
   function deleteMailbox($folder)
   {
     return (TRUE);
@@ -218,7 +183,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);
   }
 
 }