diff options
| author | Ermal <eri@pfsense.org> | 2011-05-20 16:10:27 +0000 |
|---|---|---|
| committer | Ermal <eri@pfsense.org> | 2011-05-20 16:10:27 +0000 |
| commit | aa3c48668508fbc48d86ab56073a6bd0332bf3f8 (patch) | |
| tree | d5cd8fad51ea4bcec059f9b1686d8cf35c45d076 /etc/inc/pfsense-utils.inc | |
| parent | 2a57a4d1c12874813e7162eb293ea36babd97267 (diff) | |
| download | pfsense-aa3c48668508fbc48d86ab56073a6bd0332bf3f8.zip pfsense-aa3c48668508fbc48d86ab56073a6bd0332bf3f8.tar.gz | |
Correct code to use correct refernces for proxy settings set in Advanced->misc. Reported-by: http://forum.pfsense.org/index.php/topic,36939.0.html
Diffstat (limited to 'etc/inc/pfsense-utils.inc')
| -rw-r--r-- | etc/inc/pfsense-utils.inc | 16 |
1 files changed, 8 insertions, 8 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc index 81964b3..ca16634 100644 --- a/etc/inc/pfsense-utils.inc +++ b/etc/inc/pfsense-utils.inc @@ -708,14 +708,14 @@ function call_pfsense_method($method, $params, $timeout = 0) { $proxyport = 0; $proxyuser = ""; $proxypass = ""; - if (!empty($config['system']['httpproxy'])) - $proxyurl = $config['system']['httpproxy']; - if (!empty($config['system']['httpproxyport']) && is_numeric($config['system']['httpproxyport'])) - $proxyport = $config['system']['httpproxyport']; - if (!empty($config['system']['httpproxyuser'])) - $proxyuser = $config['system']['httpproxyuser']; - if (!empty($config['system']['httpproxypass'])) - $proxypass = $config['system']['httpproxypass']; + if (!empty($config['system']['proxyurl'])) + $proxyurl = $config['system']['proxyurl']; + if (!empty($config['system']['proxyport']) && is_numeric($config['system']['proxyport'])) + $proxyport = $config['system']['proxyport']; + if (!empty($config['system']['proxyuser'])) + $proxyuser = $config['system']['proxyuser']; + if (!empty($config['system']['proxypass'])) + $proxypass = $config['system']['proxypass']; $cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url, $port, $proxyurl, $proxyport, $proxyuser, $proxypass); // If the ALT PKG Repo has a username/password set, use it. if($config['system']['altpkgrepo']['username'] && |
