More refinements to the unofficial package repository warning ( Issue #484 ) -- Now also shows on Dashboard and installed package list. Cleaned up some code and shuffled things around to avoid unnecessary repetition.

1 files changed, 13 insertions, 2 deletions

diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index a1b26b9..d16a2f0 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -670,7 +670,7 @@ function rmdir_recursive($path,$follow_links=false) {
 function call_pfsense_method($method, $params, $timeout = 0) {
 	global $g, $config;
 
-	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
+	$xmlrpc_base_url = get_active_xml_rpc_base_url();
 	$xmlrpc_path = $g['xmlrpcpath'];
 	
 	$xmlrpcfqdn = preg_replace("(https?://)", "", $xmlrpc_base_url);
@@ -718,7 +718,7 @@ function call_pfsense_method($method, $params, $timeout = 0) {
 function check_firmware_version($tocheck = "all", $return_php = true) {
 	global $g, $config;
 	
-	$xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl'];
+	$xmlrpc_base_url = get_active_xml_rpc_base_url();
 	$xmlrpcfqdn = preg_replace("(https?://)", "", $xmlrpc_base_url);
 	$ip = gethostbyname($xmlrpcfqdn);
 	if($ip == $xmlrpcfqdn)
@@ -2897,4 +2897,15 @@ function pkg_call_plugins($plugin_type, $plugin_params) {
 	return $results;
 }
 
+/* Function to find and return the active XML RPC base URL to avoid code duplication */
+function get_active_xml_rpc_base_url() {
+	global $config, $g;
+	/* If the user has activated the option to enable an alternate xmlrpcbaseurl, and it's not empty, then use it */
+	if (isset($config['system']['altpkgrepo']['enable']) && !empty($config['system']['altpkgrepo']['xmlrpcbaseurl'])) {
+		return $config['system']['altpkgrepo']['xmlrpcbaseurl'];
+	} else {
+		return $g['xmlrpcbaseurl'];
+	}
+}
+
 ?>