diff options
author | Colin Smith <colin@pfsense.org> | 2005-03-20 04:49:29 +0000 |
---|---|---|
committer | Colin Smith <colin@pfsense.org> | 2005-03-20 04:49:29 +0000 |
commit | 20b02a6dda20812a0016263acb3b9972ffbfabe2 (patch) | |
tree | 8929963431e551e7433a082a125acf75dcbaf9db /usr/local | |
parent | fa0c52c62f409303a84da256908e13c9d22290b1 (diff) | |
download | pfsense-20b02a6dda20812a0016263acb3b9972ffbfabe2.zip pfsense-20b02a6dda20812a0016263acb3b9972ffbfabe2.tar.gz |
Call fetch_latest_pkg_config() instead of duplicating code.
Diffstat (limited to 'usr/local')
-rwxr-xr-x | usr/local/www/pkg_mgr.php | 14 |
1 files changed, 2 insertions, 12 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php index b02237f..ef6dfc8 100755 --- a/usr/local/www/pkg_mgr.php +++ b/usr/local/www/pkg_mgr.php @@ -71,17 +71,8 @@ include("fbegin.inc"); <?php if ($savemsg) print_info_box($savemsg); ?> <?php -// Allow package location to be overriden -$config_location = "http://www.pfsense.com/packages/pkg_config.xml"; -if(isset($config['system']['alt_pkgconfig_url']['enabled'])) - $config_location = $config['system']['alt_pkgconfig_url']['pkgconfig_base_url'] . $config['system']['alt_pkgconfig_url']['pkgconfig_filename']; - if(!file_exists("{$g['tmp_path']}/pkg_config.xml")) { - mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"" . $config_location . "\" >/dev/null 2>&1 "); - if(!file_exists("{$g['tmp_path']}/pkg_config.xml")) { - print_info_box_np("Could not download pkg_config.xml from pfSense.com. Check your DNS settings."); - die; - } + fetch_latest_pkg_config(); } $pkg_config = parse_xml_config_pkg("{$g['tmp_path']}/pkg_config.xml", "pfsensepkgs"); @@ -109,9 +100,8 @@ if(!$pkg_config['packages']) { <?php $i = 0; foreach ($pkg_config['packages']['package'] as $pkg) { - $pkgname = ""; $pkgname = $pkg['name']; - if($config['installedpackages']['package']) { + if($config['installedpackages']['package'] != "") { foreach ($config['installedpackages']['package'] as $installed) { if($installed['name'] == $pkg['name']) $pkgname = ""; |