baculum: Send config to api server as json

diff --git a/gui/baculum/protected/API/Pages/API/Config.php b/gui/baculum/protected/API/Pages/API/Config.php
index bec7f40b464981f427793a828d15b23edb46ecc8..0ecdb0c842a330899f489ce633707aa37a401dd0 100644 (file)
--- a/gui/baculum/protected/API/Pages/API/Config.php
+++ b/gui/baculum/protected/API/Pages/API/Config.php
@@ -36,7 +36,7 @@ class Config extends BaculumAPIServer {
        public function set($id, $params) {
                $config = (array)$params;
                if (array_key_exists('config', $config)) {
-                       $config = unserialize($config['config']);
+                       $config = json_decode($config['config'], true);
                } else {
                        $config = array();
                }

diff --git a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
index 02fc3ec7321d704d4c7309d7f2837abc136019cf..32654259aa8138566a0609894df6aad69ff04415 100644 (file)
--- a/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
+++ b/gui/baculum/protected/Web/Portlets/BaculaConfigDirectives.php
@@ -303,7 +303,7 @@ class BaculaConfigDirectives extends DirectiveListTemplate {
                        $resource_type,
                        $resource_name
                );
-               $result = $this->Application->getModule('api')->set($params, array('config' => serialize($directives)), $host, false);
+               $result = $this->Application->getModule('api')->set($params, array('config' => json_encode($directives)), $host, false);
                if ($result->error === 0) {
                        $this->SaveDirectiveOk->Display = 'Dynamic';
                        $this->SaveDirectiveError->Display = 'None';