From: hzerres <hzerres@594d385d-05f5-0310-b6e9-bd551577e9d8>
Date: Fri, 15 Oct 2010 13:42:09 +0000 (+0000)
Subject: (groupware) removed debug output and not functional features
X-Git-Url: https://git.tokkee.org/?a=commitdiff_plain;h=ce23dab72641934ce4cf07cedacac4c4af2c2efd;p=gosa.git

(groupware) removed debug output and not functional features

git-svn-id: https://oss.gonicus.de/repositories/gosa/trunk@20063 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 e67535794..1fb44939b 100644
--- a/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_Groupware.inc
@@ -156,9 +156,9 @@ class Groupware extends plugin
         $featureReq = array(
                 "primaryMail" 				=> array(
                     'acctGetPrimaryMailAddress'),
-                "quotaUsage"                => array(
+                "quotaUsage"                => array("_off",
                     'acctGetQuota'),
-                "quotaSize"                 => array(
+                "quotaSize"                 => array("_off",
                     'acctSetQuota','acctGetQuota'),
                 "mailLocations"				=> array(
                     'getMailboxLocations'),
@@ -172,11 +172,11 @@ class Groupware extends plugin
                     'acctGetMailForwardAddresses','acctSetMailForwardAddresses'),
                 "vacationMessage"           => array("_off",
                     'acctDelFilter','acctGetFilters','acctSetFilters','acctSetFilters'),
-                "mailBoxWarnLimit"          => array(
+                "mailBoxWarnLimit"          => array("_off",
                     'acctSetQuota','acctGetQuota'),
-                "mailBoxSendSizelimit"      => array(
+                "mailBoxSendSizelimit"      => array("_off",
                         'acctSetQuota','acctGetQuota'),
-                "mailBoxHardSizelimit"      => array(
+                "mailBoxHardSizelimit"      => array("_off",
                         'acctSetQuota','acctGetQuota'),
                 "mailBoxAutomaticRemoval"   => array("_off",
                         'acctSetQuota','acctGetQuota'),
@@ -624,7 +624,7 @@ class Groupware extends plugin
      */ 
     function delForwarder($addresses)
     {
-		print_a(array("Del forwarder"));
+		
         if($this->acl_is_writeable("forwardingAddresses")){
             $this->forwardingAddresses= array_remove_entries ($addresses, $this->forwardingAddresses);
             $this->is_modified= TRUE;
diff --git a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
index 5b080a1bc..2772b6e9d 100644
--- a/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
+++ b/gosa-plugins/groupware/personal/groupware/class_GroupwareDao.inc
@@ -266,9 +266,7 @@ class GroupwareDao{
             // Usage is a Mapi function which is not yet 
             
             // TODO: Remove the following dummy and enable the qota fetch from groupware
-             
-            //echo "Quota function not yet implemented on server side!!";
-            //$quota = $this->get("quotaSize", array($uid));
+            $quota = $this->get("quotaSize", array($uid));
             $quota = array(	"warn_limit" => 1008,
                     "send_limit" => 108,
                     "hard_limit" => 1108,
@@ -297,6 +295,7 @@ class GroupwareDao{
                 $resultArr["mailBoxHardSizelimitEnabled"] = FALSE;
                 $resultArr["mailBoxHardSizelimitValue"] = 0;
             }
+			
         }
 
         //this function seems to be broken on the server.
@@ -340,7 +339,6 @@ class GroupwareDao{
 						$this->delete("mailFolder", $id, $key);
 						break;
 				}
-				print_a($val);
 			}
 			$this->save("private_folderACLS", $id, $val["acls"]);
 			//otherwise nothing happened with the entry - no action should be performed.