3 files changed, 5 insertions, 3 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 0a0f941..be50197 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -792,7 +792,7 @@ function call_pfsense_method($method, $params, $timeout = 0) {
 	if($ip == $g['product_website'])
 		return false;
 
-	$xmlrpc_base_url = $g['xmlrpcbaseurl'];
+	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
 	$xmlrpc_path = $g['xmlrpcpath'];
 	$msg = new XML_RPC_Message($method, array(XML_RPC_Encode($params)));
 	$cli = new XML_RPC_Client($xmlrpc_path, $xmlrpc_base_url);
diff --git a/etc/inc/pkg-utils.inc b/etc/inc/pkg-utils.inc
index 6b5de9c..3f04edc 100644
--- a/etc/inc/pkg-utils.inc
+++ b/etc/inc/pkg-utils.inc
@@ -152,7 +152,8 @@ function get_pkg_sizes($pkgs = 'all') {
 	global $g;
 	$params = array("pkg" => $pkgs);
 	$msg = new XML_RPC_Message('pfsense.get_pkg_sizes', array(php_value_to_xmlrpc($params)));
-	$cli = new XML_RPC_Client($g['xmlrpcpath'], $g['xmlrpcbaseurl']);
+	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
+	$cli = new XML_RPC_Client($g['xmlrpcpath'], $xmlrpc_base_url);
 	$resp = $cli->send($msg, 10);
 	if($resp and !$resp->faultCode()) {
 		$raw_versions = $resp->value();
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 62e6515..c647a4b 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -51,7 +51,8 @@ if($pkg_info) {
 } else {
 	$using_cache = true;
 	if(file_exists("{$g['tmp_path']}/pkg_info.cache")) {
-		$savemsg = "Unable to retrieve package info from {$g['xmlrpcbaseurl']}. Cached data will be used.";
+		$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
+		$savemsg = "Unable to retrieve package info from {$xmlrpc_base_url}. Cached data will be used.";
 		$pkg_info = unserialize(@file_get_contents("{$g['tmp_path']}/pkg_info.cache"));
 	} else {
 		$savemsg = "Unable to communicate to {$g['product_website']}.  Please check DNS, default gateway, etc.";