diff options
| author | Scott Ullrich <sullrich@pfsense.org> | 2005-01-22 04:50:29 +0000 |
|---|---|---|
| committer | Scott Ullrich <sullrich@pfsense.org> | 2005-01-22 04:50:29 +0000 |
| commit | b6f87f462658c1b3ce039682119efa14bc4ef70a (patch) | |
| tree | 3600ee29f770ebad047c6e9eb03c09c754e1ae24 /usr/local/www | |
| parent | 741476956fb281d25eabe26fd136b7aef876506d (diff) | |
| download | pfsense-b6f87f462658c1b3ce039682119efa14bc4ef70a.zip pfsense-b6f87f462658c1b3ce039682119efa14bc4ef70a.tar.gz | |
Update (C)
Diffstat (limited to 'usr/local/www')
| -rwxr-xr-x | usr/local/www/pkg_mgr_install.php | 39 | ||||
| -rwxr-xr-x | usr/local/www/status.php | 6 |
2 files changed, 26 insertions, 19 deletions
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"); |
