Project

General

Profile

« Previous | Next » 

Revision aa3c4866

Added by Ermal LUÇI about 14 years ago

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

View differences:

etc/inc/pfsense-utils.inc
708 708 
	$proxyport = 0;
709 709 
	$proxyuser = "";
710 710 
	$proxypass = "";
711 
	if (!empty($config['system']['httpproxy']))
712 
		$proxyurl = $config['system']['httpproxy'];
713 
	if (!empty($config['system']['httpproxyport']) && is_numeric($config['system']['httpproxyport']))
714 
		$proxyport = $config['system']['httpproxyport'];
715 
	if (!empty($config['system']['httpproxyuser']))
716 
		$proxyuser = $config['system']['httpproxyuser'];
717 
	if (!empty($config['system']['httpproxypass']))
718 
		$proxypass = $config['system']['httpproxypass'];
711 
	if (!empty($config['system']['proxyurl']))
712 
		$proxyurl = $config['system']['proxyurl'];
713 
	if (!empty($config['system']['proxyport']) && is_numeric($config['system']['proxyport']))
714 
		$proxyport = $config['system']['proxyport'];
715 
	if (!empty($config['system']['proxyuser']))
716 
		$proxyuser = $config['system']['proxyuser'];
717 
	if (!empty($config['system']['proxypass']))
718 
		$proxypass = $config['system']['proxypass'];
719 719 
	$cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url, $port, $proxyurl, $proxyport, $proxyuser, $proxypass);
720 720 
	// If the ALT PKG Repo has a username/password set, use it.
721 721 
	if($config['system']['altpkgrepo']['username'] &&

Also available in: Unified diff