summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--etc/inc/pfsense-utils.inc9
-rwxr-xr-xusr/local/www/diag_pkglogs.php17
2 files changed, 14 insertions, 12 deletions
diff --git a/etc/inc/pfsense-utils.inc b/etc/inc/pfsense-utils.inc
index 38b6b03..05df632 100644
--- a/etc/inc/pfsense-utils.inc
+++ b/etc/inc/pfsense-utils.inc
@@ -370,10 +370,11 @@ function get_pkg_id($pkg_name) {
global $config;
global $pkg_config;
$i=0;
- foreach ($config['installedpackages']['package'] as $pkg) {
- if($pkg['name'] == $pkg_name) return $i;
- $i++;
- }
+ if(is_array($config['installedpackages']['package']))
+ foreach ($config['installedpackages']['package'] as $pkg) {
+ if($pkg['name'] == $pkg_name) return $i;
+ $i++;
+ }
return -1;
}
diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php
index c799f22..c0b3134 100755
--- a/usr/local/www/diag_pkglogs.php
+++ b/usr/local/www/diag_pkglogs.php
@@ -52,15 +52,16 @@ if ($_POST['clear']) {
$i = 0;
$apkg = $_POST['pkg'];
if(!isset($_POST['pkg'])) { // If we aren't looking for a specific package, locate the first package that handles logging.
- foreach($config['installedpackages']['package'] as $package) {
- $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui");
- if(is_array($pkg_config['logging'])) {
- $apkg = $package['name'];
- $apkgid = $i;
- break;
+ if(is_array($config['installedpackages']['package']))
+ foreach($config['installedpackages']['package'] as $package) {
+ $pkg_config = parse_xml_config_pkg("/usr/local/pkg/" . $package['configurationfile'], "packagegui");
+ if(is_array($pkg_config['logging'])) {
+ $apkg = $package['name'];
+ $apkgid = $i;
+ break;
+ }
+ $i++;
}
- $i++;
- }
} else {
$apkgid = get_pkg_id($apkg);
}
OpenPOWER on IntegriCloud