From b6f87f462658c1b3ce039682119efa14bc4ef70a Mon Sep 17 00:00:00 2001
From: Scott Ullrich <sullrich@pfsense.org>
Date: Sat, 22 Jan 2005 04:50:29 +0000
Subject: Update (C)

---
 etc/inc/filter.inc                |  6 ++++--
 usr/local/www/pkg_mgr_install.php | 39 ++++++++++++++++++++-------------------
 usr/local/www/status.php          |  6 ++++++
 3 files changed, 30 insertions(+), 21 deletions(-)

diff --git a/etc/inc/filter.inc b/etc/inc/filter.inc
index 8d38120..63e1250 100644
--- a/etc/inc/filter.inc
+++ b/etc/inc/filter.inc
@@ -790,7 +790,8 @@ EOD;
 		}
 	}
 
-	if (run_command_return_string("ls /var/db/pkg/ | grep squid") <> "") {
+	$squid_installed = run_command_return_string("/bin/ls /var/db/pkg/ | grep squid");
+	if ($squid_installed <> "") {
 		$natrules .= "rdr on " . $lanif . " inet proto tcp from any to any port www -> 127.0.0.1 port 3128\n";
 	}
 
@@ -878,7 +879,8 @@ function filter_rules_generate() {
 	}
 
 	/* if squid is installed, lets install its rule */
-	if (run_command_return_string("ls /var/db/pkg/ | grep squid") <> "") {
+	$squid_installed = run_command_return_string("/bin/ls /var/db/pkg/ | grep squid");
+	if ($squid_installed <> "") {
 		$ipfrules .= "pass in on " . $lanif . " inet proto tcp from any to 127.0.0.1 port 3128 keep state\n";
 		$ipfrules .= "pass out on " . $wanif . "  inet proto tcp from any to any port www keep state\n";
 	}
diff --git a/usr/local/www/pkg_mgr_install.php b/usr/local/www/pkg_mgr_install.php
index 8e74558..9d5980f 100755
--- a/usr/local/www/pkg_mgr_install.php
+++ b/usr/local/www/pkg_mgr_install.php
@@ -373,25 +373,26 @@ if(file_exists("/usr/local/pkg/" . $pkgent['name'] . ".xml")) {
              * loop through menu installation items
              * installing multiple items if need be.
             */
-            foreach ($package_conf['menu'] as $menu) {
-                        // install menu item into the ext folder
-                        fwrite($fd_log, "Adding menu option to " . $menu['section'] . "/" . $menu['name'] . "\n");
-                        $fd = fopen("/usr/local/www/ext/" . $menu['section'] . "/" . $menu['name'] , "w");
-                        if($menu['url'] <> "") {
-                                    // override $myurl for script.
-                                    $toeval = "\$myurl = \"" . getenv("HTTP_HOST") . "\"; \n";
-                                    eval($toeval);
-                                    // eval url so that above $myurl item can be processed if need be.
-                                    $urltmp = $menu['url'];
-                                    $toeval = "\$url = \"" . $urltmp . "\"; \n";
-                                    eval($toeval);
-                                    fwrite($fd, $url . "\n");
-                        } else {
-                                    $xml = "";
-                                    if(stristr($menu['configfile'],".xml") == "") $xml = ".xml";
-                                    fwrite($fd, "/pkg.php?xml=" . $menu['configfile'] . $xml . "\n");
-                        }
-                        fclose($fd);
+            if(is_array($package_conf['menu']))
+                foreach ($package_conf['menu'] as $menu) {
+                            // install menu item into the ext folder
+                            fwrite($fd_log, "Adding menu option to " . $menu['section'] . "/" . $menu['name'] . "\n");
+                            $fd = fopen("/usr/local/www/ext/" . $menu['section'] . "/" . $menu['name'] , "w");
+                            if($menu['url'] <> "") {
+                                        // override $myurl for script.
+                                        $toeval = "\$myurl = \"" . getenv("HTTP_HOST") . "\"; \n";
+                                        eval($toeval);
+                                        // eval url so that above $myurl item can be processed if need be.
+                                        $urltmp = $menu['url'];
+                                        $toeval = "\$url = \"" . $urltmp . "\"; \n";
+                                        eval($toeval);
+                                        fwrite($fd, $url . "\n");
+                            } else {
+                                        $xml = "";
+                                        if(stristr($menu['configfile'],".xml") == "") $xml = ".xml";
+                                        fwrite($fd, "/pkg.php?xml=" . $menu['configfile'] . $xml . "\n");
+                            }
+                            fclose($fd);
             }
 } else {
             update_output_window("WARNING! /usr/local/pkg/" . $pkgent['name'] . ".xml" . " does not exist!\n");
diff --git a/usr/local/www/status.php b/usr/local/www/status.php
index 0f4b83b..14fae58 100755
--- a/usr/local/www/status.php
+++ b/usr/local/www/status.php
@@ -95,6 +95,12 @@ defCmdT("pfctl -si", "/sbin/pfctl -si");
 defCmdT("pfctl -sa"," /sbin/pfctl -sa");
 defCmdT("pfctl -s rules -v","/sbin/pfctl -s rules -v");
 defCmdT("pfctl -s queue -v","/sbin/pfctl -s queue -v");
+defCmdT("pftop -w 150 -a -b","/usr/local/sbin/pftop -a -b");
+defCmdT("pftop -w 150 -a -b -v long","/usr/local/sbin/pftop -w 150 -a -b -v long");
+defCmdT("pftop -w 150 -a -b -v queue","/usr/local/sbin/pftop -w 150 -a -b -v queue");
+defCmdT("pftop -w 150 -a -b -v rules","/usr/local/sbin/pftop -w 150 -a -b -v rules");
+defCmdT("pftop -w 150 -a -b -v size","/usr/local/sbin/pftop -w 150 -a -b -v size");
+defCmdT("pftop -w 150 -a -b -v speed","/usr/local/sbin/pftop -w 150 -a -b -v speed");
 
 defCmdT("resolv.conf","cat /etc/resolv.conf");
 
-- 
cgit v1.1