diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2011-05-31 13:45:16 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2011-05-31 13:45:16 -0400 |
commit | db748384c13c38f2b4f3358d1980f74e79aacf77 (patch) | |
tree | 8a74cf2ec4f8b1dc2b2537e66ee426ae42b6481a /usr/local/www | |
parent | 10d74dff5a96deeacc57b81bab723740267fc5b8 (diff) | |
download | pfsense-db748384c13c38f2b4f3358d1980f74e79aacf77.zip pfsense-db748384c13c38f2b4f3358d1980f74e79aacf77.tar.gz |
Add merge handler code
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 13 |
1 files changed, 11 insertions, 2 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 97fbc45..7c2e1d0 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -271,8 +271,17 @@ $merge_config_section_sig = array( function merge_config_section_xmlrpc($raw_params) { global $config, $xmlrpc_g; - - return restore_config_section_xmlrpc($raw_params); + $params = xmlrpc_params_to_php($raw_params); + if(!xmlrpc_auth($params)) + return $xmlrpc_g['return']['authfail']; + $config_new = array_merge($config, $params[0]); + $config = $config_new; + $mergedkeys = implode(",", array_keys($params[0])); + $fd = fopen("/tmp/array.txt", "w"); + fwrite($fd, print_r($params[0], true)); + fclose($fd); + write_config(sprintf(gettext("Merged in config (%s sections) from XMLRPC client."), $mergedkeys)); + return $xmlrpc_g['return']['true']; } /*****************************/ |