summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRenato Botelho <renato@netgate.com>2016-01-22 08:20:47 -0200
committerRenato Botelho <renato@netgate.com>2016-01-22 08:20:47 -0200
commitc6625b3a2c98a06ce53512b7abc78db4c3d0789a (patch)
treebb103a8f8434cd3400529a7af847d58be6f1952a
parent9b40b1514d24eaf722421adf657d17a6c4bfdb9f (diff)
parent29e5cbb44f56527334807c19c8d56651dcda91f1 (diff)
downloadpfsense-c6625b3a2c98a06ce53512b7abc78db4c3d0789a.zip
pfsense-c6625b3a2c98a06ce53512b7abc78db4c3d0789a.tar.gz
Merge pull request #2494 from phil-davis/patch-2
-rwxr-xr-xsrc/usr/local/www/xmlrpc.php13
1 files changed, 7 insertions, 6 deletions
diff --git a/src/usr/local/www/xmlrpc.php b/src/usr/local/www/xmlrpc.php
index b70f592..559a168 100755
--- a/src/usr/local/www/xmlrpc.php
+++ b/src/usr/local/www/xmlrpc.php
@@ -344,8 +344,8 @@ function restore_config_section_xmlrpc($raw_params) {
}
/*****************************/
-$merge_config_section_doc = gettext("XMLRPC wrapper for merging package sections. This method must be called with two parameters: a string containing the local system\'s password and an array to merge into the system\'s config. This function returns true upon completion.");
-$merge_config_section_sig = array(
+$merge_installedpackages_section_doc = gettext("XMLRPC wrapper for merging package sections. This method must be called with two parameters: a string containing the local system\'s password and an array to merge into the system\'s config. This function returns true upon completion.");
+$merge_installedpackages_section_sig = array(
array(
$XML_RPC_Boolean,
$XML_RPC_String,
@@ -552,7 +552,8 @@ $server = new XML_RPC_Server(
'signature' => $filter_configure_sig,
'docstring' => $filter_configure_doc),
'pfsense.interfaces_carp_configure' => array('function' => 'interfaces_carp_configure_xmlrpc',
- 'docstring' => $carp_configure_sig),
+ 'signature' => $carp_configure_sig,
+ 'docstring' => $carp_configure_doc),
'pfsense.backup_config_section' => array('function' => 'backup_config_section_xmlrpc',
'signature' => $backup_config_section_sig,
'docstring' => $backup_config_section_doc),
@@ -563,11 +564,11 @@ $server = new XML_RPC_Server(
'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_installedpackages_section_sig,
+ 'docstring' => $merge_installedpackages_section_doc),
'pfsense.host_firmware_version' => array('function' => 'pfsense_firmware_version_xmlrpc',
'signature' => $pfsense_firmware_version_sig,
- 'docstring' => $host_firmware_version_doc),
+ 'docstring' => $pfsense_firmware_version_doc),
'pfsense.reboot' => array('function' => 'reboot_xmlrpc',
'signature' => $reboot_sig,
'docstring' => $reboot_doc),
OpenPOWER on IntegriCloud