summaryrefslogtreecommitdiffstats
path: root/lib/kolab_api_controller.php
diff options
context:
space:
mode:
authorAleksander Machniak <alec@alec.pl>2012-10-24 20:13:57 +0200
committerAleksander Machniak <alec@alec.pl>2012-10-24 20:13:57 +0200
commit37d055e9ac0616cd210279e8db5efe3e51a26899 (patch)
tree1d793a8e8d66dfac7bd1d6fa124a5fa307edc9fd /lib/kolab_api_controller.php
parent1f4ffa342d4d613fc5801b0f04d00a40fe422518 (diff)
downloadwebadmin-37d055e9ac0616cd210279e8db5efe3e51a26899.tar.gz
Implement base64 encoding of binary content in JSON data (Bug #1047)
Diffstat (limited to 'lib/kolab_api_controller.php')
-rw-r--r--lib/kolab_api_controller.php5
1 files changed, 4 insertions, 1 deletions
diff --git a/lib/kolab_api_controller.php b/lib/kolab_api_controller.php
index 0e45a30..a4a4b78 100644
--- a/lib/kolab_api_controller.php
+++ b/lib/kolab_api_controller.php
@@ -138,10 +138,13 @@ class kolab_api_controller
$service = $this->request['service'];
$method = $this->request['method'];
- $postdata = @json_decode($postdata, true);
Log::debug("Calling $service.$method");
+ // Decode request data
+ $postdata = @json_decode($postdata, true);
+ kolab_json_output::decode($postdata);
+
// validate user session
if (!in_array($method, array('quit', 'authenticate'))) {
if (!$this->session_validate($postdata)) {