From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Tue, 19 Oct 2010 09:50:05 +0000 (+0000)
Subject: (groupware)activated quota functionality
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=5a6eae7e00649d6710560f49d4d4bfb91092f112;p=gosa.git

(groupware)activated quota functionality

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20092 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 1fb44939b..0f03abdb3 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -172,13 +172,13 @@ class Groupware extends plugin
                     'acctGetMailForwardAddresses','acctSetMailForwardAddresses'),
                 "vacationMessage"           => array("_off",
                     'acctDelFilter','acctGetFilters','acctSetFilters','acctSetFilters'),
-                "mailBoxWarnLimit"          => array("_off",
+                "mailBoxWarnLimit"          => array(
                     'acctSetQuota','acctGetQuota'),
-                "mailBoxSendSizelimit"      => array("_off",
+                "mailBoxSendSizelimit"      => array(
                         'acctSetQuota','acctGetQuota'),
-                "mailBoxHardSizelimit"      => array("_off",
+                "mailBoxHardSizelimit"      => array(
                         'acctSetQuota','acctGetQuota'),
-                "mailBoxAutomaticRemoval"   => array("_off",
+                "mailBoxAutomaticRemoval"   => array(
                         'acctSetQuota','acctGetQuota'),
                 "localDeliveryOnly"         => array( "_off",
                         'acctDelFilter','acctGetFilters','acctSetFilters','acctSetFilters'),
diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 2772b6e9d..6194987fe 100644
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -188,7 +188,7 @@ class GroupwareDao{
 		
 			//Folder Id from the User ...
 			//user/$id/
-			//$resultArr["mailFolder"] = $this->get("mailFolder", array("user/".$uid."/"));
+			$resultArr["mailFolder"] = $this->get("mailFolder", array("user/".$uid."/"));
 			//print_a($resultArr["mailFolder"]);
 			/*
 			"RIGHTS_NONE", 0);
@@ -198,6 +198,7 @@ class GroupwareDao{
 			"RIGHTS_WRITE", RIGHTS_APPEND | WRITE | CREATE | DELETE);
             ""
              */
+			 /*
             $resultArr["mailFolder"] = array(
                     'user/wiwu/Aufgaben' => array( 
                         "name" =>"Aufgaben",
@@ -246,7 +247,9 @@ class GroupwareDao{
                                     "name" => "wiwu",
                                     "acl" => GROUPWARE_RIGHTS_ALL, 
                                     "type"=>"user"))), 
-                    );
+									);
+					*/
+            
 			
 			//need a status for the array - setting them now for the example data.
             foreach($resultArr["mailFolder"] as $id => $folder){
@@ -265,13 +268,16 @@ class GroupwareDao{
 
             // Usage is a Mapi function which is not yet 
             
-            // TODO: Remove the following dummy and enable the qota fetch from groupware
-            $quota = $this->get("quotaSize", array($uid));
-            $quota = array(	"warn_limit" => 1008,
+            // example Array for Quota
+			/*
+			$quota = array(	"warn_limit" => 1008,
                     "send_limit" => 108,
                     "hard_limit" => 1108,
                     "hold" => 508,
                     "usage" => 1108);
+			*/
+            $quota = $this->get("quotaSize", array($uid));
+            
             $resultArr["quotaSize"] = $quota["usage"];
             $resultArr["quotaSize"] = $quota["hold"];
             if($quota["warn_limit"] > 0){