From 1a14b67d4ab19230f5446cc166eeaf1bd559a684 Mon Sep 17 00:00:00 2001
From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Thu, 18 Nov 2010 15:13:21 +0000
Subject: [PATCH] (libgroupware) removed hold and fixed mapping of warn_limit

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20274 594d385d-05f5-0310-b6e9-bd551577e9d8
---
 .../groupware/personal/groupware/class_Groupware.inc     | 9 +++++----
 .../groupware/personal/groupware/class_GroupwareDao.inc  | 2 +-
 2 files changed, 6 insertions(+), 5 deletions(-)

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index 44e07d0f9..121e6e386 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -186,9 +186,9 @@ class Groupware extends plugin
                 "mailBoxSendSizelimit"      => array(
                         'acctSetQuota','acctGetQuota'),
                 //This is the same as qotaSize - should stay turned off
-                "mailBoxHardSizelimit"      => array( "_off",
+                "mailBoxHardSizelimit"      => array("_off",
                         'acctSetQuota','acctGetQuota'),
-                "mailBoxAutomaticRemoval"   => array(
+                "mailBoxAutomaticRemoval"   => array("_off",
                         'acctSetQuota','acctGetQuota'),
                 "localDeliveryOnly"         => array( "_off",
                         'acctDelFilter','acctGetFilters','acctSetFilters','acctSetFilters'),
@@ -857,8 +857,9 @@ class Groupware extends plugin
                     $this->hasFeaturebeenChanged("mailBoxAutomaticRemoval") )){
             $quota = array(	"warn_limit" => $this->mailBoxWarnLimitValue,
                     "send_limit" => $this->mailBoxSendSizelimitValue,
-                    "hard_limit" => null,
-                    "hold" => $this->quotaSize);
+                    "hard_limit" => $this->quotaSize);
+					//hold cannot be saved (in Exchange) right now - should be excluded for now.
+                    //"hold" => $this->mailBoxAutomaticRemovalValue);
 
             $res = $this->groupwareDao->save("quotaSize", $this->uid, $quota);
             if($res === NULL){
diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 635843d49..3147f6e2c 100644
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -182,7 +182,7 @@ class GroupwareDao{
 		$resultArr["quotaSize"] = $comp["quota"]["usage"];
 
 		$resultArr["mailBoxWarnLimitEnabled"] = TRUE;
-		$resultArr["mailBoxWarnLimitValue"] = $comp["quota"]["usage"];
+		$resultArr["mailBoxWarnLimitValue"] = $comp["quota"]["warn_limit"];
 
 		$resultArr["mailBoxSendSizelimitEnabled"] = TRUE;
 		$resultArr["mailBoxSendSizelimitValue"] = $comp["quota"]["send_limit"];
-- 
2.30.2