(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

diff --git a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
index 44e07d0f97d2fd0485e9cfa0d12cbaef8c65a9bd..121e6e3861a60d92cbbaf05fb6c062f6e0c12ff9 100644 (file)
--- 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 635843d499604bd0fb8db2cea8d0998435a31dfb..3147f6e2ca25ff8dfb95d9dc4c16204348712142 100644 (file)
--- 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"];