summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorScott Ullrich <sullrich@pfsense.org>2005-02-01 16:54:56 +0000
committerScott Ullrich <sullrich@pfsense.org>2005-02-01 16:54:56 +0000
commit175ac6e4d4a9c75b63e405009e6816c60db417f2 (patch)
tree64e90f195dfadb55be869cf5d24a14fca3afb11f
parentc5a17c26a880a94a9caeb0b57ff12a88c21215f4 (diff)
downloadpfsense-175ac6e4d4a9c75b63e405009e6816c60db417f2.zip
pfsense-175ac6e4d4a9c75b63e405009e6816c60db417f2.tar.gz
After fixing the diagnostics and optional interfaces items, we lost the functionality to see which packages are installed. Bring this back.
-rwxr-xr-xusr/local/www/pkg_mgr.php14
1 files changed, 8 insertions, 6 deletions
diff --git a/usr/local/www/pkg_mgr.php b/usr/local/www/pkg_mgr.php
index 687cf97..fa7c6f8 100755
--- a/usr/local/www/pkg_mgr.php
+++ b/usr/local/www/pkg_mgr.php
@@ -73,8 +73,8 @@ include("fbegin.inc");
// Allow package location to be overriden
$config_location = "http://www.pfsense.com/packages/pkg_config.xml";
-if($configa['package_location'])
- $config_location = $configa['package_location'];
+if($config['package_location'])
+ $config_location = $config['package_location'];
if(!file_exists("/tmp/pkg_config.xml")) {
mwexec("cd {$g['tmp_path']} && /usr/bin/fetch \"" . $config_location . "\" >/dev/null 2>&1 ");
@@ -109,13 +109,15 @@ if(!$pkg_config['packages']) {
<?php
$i = 0;
foreach ($pkg_config['packages']['package'] as $pkg) {
- if(is_array($configa['installedpackages']['package'])) {
- foreach ($configa['installedpackages']['package'] as $installed) {
+ $pkgname = "";
+ $pkgname = $pkg['name'];
+ if($config['installedpackages']['package']) {
+ foreach ($config['installedpackages']['package'] as $installed) {
if($installed['name'] == $pkg['name'])
- $pkg['name'] = "";
+ $pkgname = "";
}
}
- if($pkg['name'] <> "") {
+ if($pkgname <> "") {
?>
<tr valign="top">
<td class="listlr">
OpenPOWER on IntegriCloud