diff options
| author | jim-p <jimp@pfsense.org> | 2014-07-02 12:07:33 -0400 |
|---|---|---|
| committer | jim-p <jimp@pfsense.org> | 2014-07-02 12:07:33 -0400 |
| commit | 7c8f3711075d9671eda430b86ac59d6013d12cae (patch) | |
| tree | 7a4f6c4e9c01728a68a7bed6bfe7890823d0b40a /etc/phpshellsessions | |
| parent | 38c7d42e4b47e9c8d968ebf2c7a5b75806d87203 (diff) | |
| download | pfsense-7c8f3711075d9671eda430b86ac59d6013d12cae.zip pfsense-7c8f3711075d9671eda430b86ac59d6013d12cae.tar.gz | |
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.
Diffstat (limited to 'etc/phpshellsessions')
| -rw-r--r-- | etc/phpshellsessions/gitsync | 2 | ||||
| -rw-r--r-- | etc/phpshellsessions/installpkg | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/etc/phpshellsessions/gitsync b/etc/phpshellsessions/gitsync index 6c39006..e943ffa 100644 --- a/etc/phpshellsessions/gitsync +++ b/etc/phpshellsessions/gitsync @@ -83,7 +83,7 @@ if(!file_exists($GIT_BIN)) { if ($pkg_info) { echo " Done.\n"; } else { - $xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl']; + $xmlrpc_base_url = get_active_xml_rpc_base_url(); echo "\n" . sprintf(gettext(' >>> Unable to communicate with %1$s. Please verify DNS and interface configuration, and that %2$s has functional Internet connectivity.'), $xmlrpc_base_url, $g['product_name']) . "\n"; return; } diff --git a/etc/phpshellsessions/installpkg b/etc/phpshellsessions/installpkg index 15343df..30228ab 100644 --- a/etc/phpshellsessions/installpkg +++ b/etc/phpshellsessions/installpkg @@ -19,7 +19,7 @@ $pkg_info = get_pkg_info(); if ($pkg_info) { echo " Done.\n"; } else { - $xmlrpc_base_url = isset($config['system']['altpkgrepo']['enable']) ? $config['system']['altpkgrepo']['xmlrpcbaseurl'] : $g['xmlrpcbaseurl']; + $xmlrpc_base_url = get_active_xml_rpc_base_url(); echo "\n" . sprintf(gettext(' >>> Unable to communicate with %1$s. Please verify DNS and interface configuration, and that %2$s has functional Internet connectivity.'), $xmlrpc_base_url, $g['product_name']) . "\n"; return; } |
