diff options
| author | Colin Smith <colin@pfsense.org> | 2005-06-18 21:44:05 +0000 |
|---|---|---|
| committer | Colin Smith <colin@pfsense.org> | 2005-06-18 21:44:05 +0000 |
| commit | 67c6099cf28a48fff99e4905ad72e63af9a114ba (patch) | |
| tree | f30f4b0162901b812afc582d6597a2732294f646 /etc | |
| parent | 3eff038c34385e0a906caac95e6295fb741d3eb9 (diff) | |
| download | pfsense-67c6099cf28a48fff99e4905ad72e63af9a114ba.zip pfsense-67c6099cf28a48fff99e4905ad72e63af9a114ba.tar.gz | |
versioncheck -> xmlrpc
Diffstat (limited to 'etc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 9 | ||||
| -rw-r--r-- | etc/inc/pkg-utils.inc | 2 |
2 files changed, 4 insertions, 7 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 30a4fd2..cf8470b 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -834,11 +834,8 @@ function make_dirs($path, $mode = 0755) */ function check_firmware_version($tocheck = "all", $return_php = true) { global $g; - $versioncheck_base_url = $g['versioncheckbaseurl']; - $versioncheck_path = $g['versioncheckpath']; - if(isset($config['system']['alt_firmware_url']['enabled']) and isset($config['system']['alt_firmware_url']['versioncheck_base_url'])) { - $versioncheck_base_url = $config['system']['alt_firmware_url']['versioncheck_base_url']; - } + $xmlrpc_base_url = $g['xmlrpcbaseurl']; + $xmlrpc_path = $g['xmlrpcpath']; $rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))), "kernel" => array("version" => trim(file_get_contents('/etc/version_kernel'))), "base" => array("version" => trim(file_get_contents('/etc/version_base'))), @@ -857,7 +854,7 @@ function check_firmware_version($tocheck = "all", $return_php = true) { } $xmlparams = php_value_to_xmlrpc($params); $msg = new XML_RPC_Message('pfsense.get_firmware_version', array($xmlparams)); - $cli = new XML_RPC_Client($versioncheck_path, $versioncheck_base_url); + $cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url); $resp = $cli->send($msg, 10); if(!$resp or $resp->faultCode()) { $raw_versions = false; diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc index 65e0935..226d0ac 100644 --- a/etc/inc/pkg-utils.inc +++ b/etc/inc/pkg-utils.inc @@ -95,7 +95,7 @@ function get_pkg_info($pkgs = 'all', $info = 'all') { global $g; $params = array("pkg" => $pkgs, "info" => $info); $msg = new XML_RPC_Message('pfsense.get_pkgs', array(php_value_to_xmlrpc($params))); - $cli = new XML_RPC_Client($g['versioncheckpath'], $g['versioncheckbaseurl']); + $cli = new XML_RPC_Client($g['xmlrpcpath'], $g['xmlrpcbaseurl']); $resp = $cli->send($msg, 10); if($resp and !$resp->faultCode()) { $raw_versions = $resp->value(); |
