Branch 'kolab-webadmin-2.4' - 2 commits - lib/api lib/kolab_client_output.php

[Jeroen van Meeuwen]

 lib/api/kolab_api_service_form_value.php |    7 ++++++-
 lib/kolab_client_output.php              |    2 ++
 2 files changed, 8 insertions(+), 1 deletion(-)

New commits:
commit c4e79cf6a42f073f4f8fad73805329c88712bc00
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Wed Jun 13 17:20:32 2012 +0100

    form_value.validate_mailquota() to make sure the value is an integer

diff --git a/lib/api/kolab_api_service_form_value.php b/lib/api/kolab_api_service_form_value.php
index f85f45d..873c662 100644
--- a/lib/api/kolab_api_service_form_value.php
+++ b/lib/api/kolab_api_service_form_value.php
@@ -467,7 +467,7 @@ class kolab_api_service_form_value extends kolab_api_service
 
             $auth = Auth::get_instance($_SESSION['user']->get_domain());
             $conf = Conf::get_instance();
-            
+
             $unique_attr = $conf->get('unique_attribute');
             if (!$unique_attr) {
                 $unique_attr = 'nsuniqueid';
@@ -739,6 +739,11 @@ class kolab_api_service_form_value extends kolab_api_service
         }
     }
 
+    private function validate_mailquota($value)
+    {
+        return (int)($value);
+    }
+
     private function validate_mailalternateaddress($value)
     {
         $auth = Auth::get_instance();


commit 54049caf779914089cfebc183c1b38a99c80b497
Author: Jeroen van Meeuwen (Kolab Systems) <vanmeeuwen at kolabsys.com>
Date:   Mon Jun 4 16:28:46 2012 +0200

    Also include conf

diff --git a/lib/kolab_client_output.php b/lib/kolab_client_output.php
index 9fe611f..d40c323 100644
--- a/lib/kolab_client_output.php
+++ b/lib/kolab_client_output.php
@@ -51,6 +51,8 @@ class kolab_client_output
      */
     private function init()
     {
+        $conf = Conf::get_instance();
+
         $smarty_path = array('Smarty', 'smarty3', 'smarty');
 
         if ($path = $conf->get('kolab_wap', 'smarty_path')) {