diff options
author | Colin Smith <colin@pfsense.org> | 2005-06-29 23:23:28 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-06-29 23:23:28 +0000 |
commit | 335c7b2a4a421241064922faed851f324031cc39 (patch) | |
tree | 667294204fb855fd470511f00f56f76e1d9b42e7 /etc | |
parent | 58f77cd8376e87fbe59232fef5339c3ed9727b43 (diff) | |
download | pfsense-335c7b2a4a421241064922faed851f324031cc39.zip pfsense-335c7b2a4a421241064922faed851f324031cc39.tar.gz |
Fix branch support.
Diffstat (limited to 'etc')
-rw-r--r-- | etc/inc/pfsense-utils.inc | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index b7873f2..acd2277 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -839,7 +839,7 @@ function make_dirs($path, $mode = 0755) { * check_firmware_version(): Check whether the current firmware installed is the most recently released. */ function check_firmware_version($tocheck = "all", $return_php = true) { - global $g; + global $g, $config; $xmlrpc_base_url = $g['xmlrpcbaseurl']; $xmlrpc_path = $g['xmlrpcpath']; $rawparams = array("firmware" => array("version" => trim(file_get_contents('/etc/version'))), @@ -855,12 +855,13 @@ function check_firmware_version($tocheck = "all", $return_php = true) { $params['platform'] = $rawparams['platform']; } } - if(isset($config['system']['firmwarebranch'])) { - $params['branch'] = $config['system']['firmwarebranch']; + if($config['system']['firmware']['branch']) { + $params['branch'] = $config['system']['firmware']['branch']; } $xmlparams = php_value_to_xmlrpc($params); $msg = new XML_RPC_Message('pfsense.get_firmware_version', array($xmlparams)); $cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url); + //$cli->setDebug(1); $resp = $cli->send($msg, 10); if(!$resp or $resp->faultCode()) { $raw_versions = false; |