diff options
author | Ermal <eri@pfsense.org> | 2010-12-10 18:34:56 +0000 |
---|---|---|
committer | Ermal <eri@pfsense.org> | 2010-12-10 18:34:56 +0000 |
commit | 0567899d3d024618ad4b7d8274ef78c0f7669052 (patch) | |
tree | 54ed13c7a14c2130a3e8f5c5413c3599c4f1b7e9 /usr | |
parent | 4ecc2263d1fb9c66571af192d4d40da362ab4bd3 (diff) | |
download | pfsense-0567899d3d024618ad4b7d8274ef78c0f7669052.zip pfsense-0567899d3d024618ad4b7d8274ef78c0f7669052.tar.gz |
Fix config synchronization. Also unbreak the config when erroring out because it will loop indefinitely.
Diffstat (limited to 'usr')
-rwxr-xr-x | usr/local/www/xmlrpc.php | 56 |
1 files changed, 32 insertions, 24 deletions
diff --git a/usr/local/www/xmlrpc.php b/usr/local/www/xmlrpc.php index 79fb7f8..4909498 100755 --- a/usr/local/www/xmlrpc.php +++ b/usr/local/www/xmlrpc.php @@ -302,16 +302,23 @@ function check_firmware_version_xmlrpc($raw_params) { } /*****************************/ -$pfsense_firmware_version_doc = gettext("Basic XMLRPC wrapper for check_firmware_version. This function will return the output of check_firmware_version upon co mpletion."); +$pfsense_firmware_version_doc = gettext("Basic XMLRPC wrapper for check_firmware_version. This function will return the output of check_firmware_version upon completion."); + +$pfsense_firmware_version_sig = array ( + array ( + $XML_RPC_Struct, + $XML_RPC_String + ) +); function pfsense_firmware_version_xmlrpc($raw_params) { - global $xmlrpc_g, $XML_RPC_String; + global $xmlrpc_g; $params = xmlrpc_params_to_php($raw_params); if(!xmlrpc_auth($params)) return $xmlrpc_g['return']['authfail']; - return new XML_RPC_Response(new XML_RPC_encode(host_firmware_version())); + return new XML_RPC_Response(XML_RPC_encode(host_firmware_version())); } /*****************************/ @@ -359,38 +366,39 @@ function get_notices_xmlrpc($raw_params) { $server = new XML_RPC_Server( array( 'pfsense.exec_shell' => array('function' => 'exec_shell_xmlrpc', - 'signature' => $exec_shell_sig, - 'docstring' => $exec_shell_doc), + 'signature' => $exec_shell_sig, + 'docstring' => $exec_shell_doc), 'pfsense.exec_php' => array('function' => 'exec_php_xmlrpc', - 'signature' => $exec_php_sig, - 'docstring' => $exec_php_doc), + 'signature' => $exec_php_sig, + 'docstring' => $exec_php_doc), 'pfsense.filter_configure' => array('function' => 'filter_configure_xmlrpc', - 'signature' => $filter_configure_sig, - 'docstring' => $filter_configure_doc), + 'signature' => $filter_configure_sig, + 'docstring' => $filter_configure_doc), 'pfsense.interfaces_carp_configure' => array('function' => 'interfaces_carp_configure_xmlrpc', - 'docstring' => $carp_configure_sig), + 'docstring' => $carp_configure_sig), 'pfsense.backup_config_section' => array('function' => 'backup_config_section_xmlrpc', - 'signature' => $backup_config_section_sig, - 'docstring' => $backup_config_section_doc), + 'signature' => $backup_config_section_sig, + 'docstring' => $backup_config_section_doc), 'pfsense.restore_config_section' => array('function' => 'restore_config_section_xmlrpc', - 'signature' => $restore_config_section_sig, - 'docstring' => $restore_config_section_doc), + 'signature' => $restore_config_section_sig, + 'docstring' => $restore_config_section_doc), 'pfsense.merge_config_section' => array('function' => 'merge_config_section_xmlrpc', - 'signature' => $merge_config_section_sig, - 'docstring' => $merge_config_section_doc), + 'signature' => $merge_config_section_sig, + 'docstring' => $merge_config_section_doc), 'pfsense.merge_installedpackages_section_xmlrpc' => array('function' => 'merge_installedpackages_section_xmlrpc', - 'signature' => $merge_config_section_sig, - 'docstring' => $merge_config_section_doc), + 'signature' => $merge_config_section_sig, + 'docstring' => $merge_config_section_doc), 'pfsense.check_firmware_version' => array('function' => 'check_firmware_version_xmlrpc', - 'signature' => $check_firmware_version_sig, - 'docstring' => $check_firmware_version_doc), + 'signature' => $check_firmware_version_sig, + 'docstring' => $check_firmware_version_doc), 'pfsense.host_firmware_version' => array('function' => 'pfsense_firmware_version_xmlrpc', - 'docstring' => $host_firmware_version_doc), + 'signature' => $pfsense_firmware_version_sig, + 'docstring' => $host_firmware_version_doc), 'pfsense.reboot' => array('function' => 'reboot_xmlrpc', - 'signature' => $reboot_sig, - 'docstring' => $reboot_doc), + 'signature' => $reboot_sig, + 'docstring' => $reboot_doc), 'pfsense.get_notices' => array('function' => 'get_notices_xmlrpc', - 'signature' => $get_notices_sig) + 'signature' => $get_notices_sig) ) ); |