diff options
author | Scott Ullrich <sullrich@pfsense.org> | 2009-09-14 18:16:13 -0400 |
---|---|---|
committer | Scott Ullrich <sullrich@pfsense.org> | 2009-09-14 18:20:27 -0400 |
commit | 13d193c2f742f037ff4e87e373922d8b6e7c5749 (patch) | |
tree | 991614998a749391854dea5bb3cb5edc5380e88a /usr/local/www | |
parent | 40b48c6cd486efddf88a805efeb42e3181fd93bc (diff) | |
download | pfsense-13d193c2f742f037ff4e87e373922d8b6e7c5749.zip pfsense-13d193c2f742f037ff4e87e373922d8b6e7c5749.tar.gz |
Add pfSense_BUILDER_BINARIES: and pfSense_MODULE:. Adjust Copyright to include 2009 on files that I have asserted (C) on
Diffstat (limited to 'usr/local/www')
37 files changed, 212 insertions, 68 deletions
diff --git a/usr/local/www/bandwidth_by_ip.php b/usr/local/www/bandwidth_by_ip.php index 3fd01a6..8fc29e4 100755 --- a/usr/local/www/bandwidth_by_ip.php +++ b/usr/local/www/bandwidth_by_ip.php @@ -9,6 +9,11 @@ * */ +/* + pfSense_BUILDER_BINARIES: /usr/local/bin/rate + pfSense_MODULE: trafficgraph +*/ + require_once('guiconfig.inc'); require_once('interfaces.inc'); require_once('pfsense-utils.inc'); diff --git a/usr/local/www/carp_status.php b/usr/local/www/carp_status.php index c4d9477..f2dd95a 100755 --- a/usr/local/www/carp_status.php +++ b/usr/local/www/carp_status.php @@ -33,6 +33,10 @@ ##|*MATCH=carp_status.php* ##|-PRIV +/* + pfSense_BUILDER_BINARIES: /sbin/sysctl + pfSense_MODULE: carp +*/ require_once("guiconfig.inc"); require_once("xmlparse.inc"); diff --git a/usr/local/www/classes/maintable.inc b/usr/local/www/classes/maintable.inc index ecfbcf6..d3d9995 100644 --- a/usr/local/www/classes/maintable.inc +++ b/usr/local/www/classes/maintable.inc @@ -28,6 +28,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: guiutils +*/ + /* DISABLE_PHP_LINT_CHECKING */ class MainTable { @@ -187,4 +191,5 @@ class MainTable { } } -?> + +?>
\ No newline at end of file diff --git a/usr/local/www/diag_arp.php b/usr/local/www/diag_arp.php index 97db24c..a267899 100755 --- a/usr/local/www/diag_arp.php +++ b/usr/local/www/diag_arp.php @@ -2,7 +2,7 @@ /* diag_arp.php part of the pfSense project (http://www.pfsense.org) - Copyright (C) 2009 Scott Ullrich <sullrich@gmail.com> + Copyright (C) 2004-2009 Scott Ullrich <sullrich@gmail.com> originally part of m0n0wall (http://m0n0.ch/wall) Copyright (C) 2005 Paul Taylor (paultaylor@winndixie.com) and Manuel Kasper <mk@neon1.net>. @@ -30,6 +30,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /bin/cat /usr/sbin/arp + pfSense_MODULE: arp +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-arptable ##|*NAME=Diagnostics: ARP Table page diff --git a/usr/local/www/diag_backup.php b/usr/local/www/diag_backup.php index 714ca5b..c66af08 100755 --- a/usr/local/www/diag_backup.php +++ b/usr/local/www/diag_backup.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_backup.php - Copyright (C) 2004,2005,2006 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/shutdown + pfSense_MODULE: backup +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-backup/restore ##|*NAME=Diagnostics: Backup/restore page @@ -38,7 +43,6 @@ ##|*MATCH=diag_backup.php* ##|-PRIV - /* Allow additional execution time 0 = no limit. */ ini_set('max_execution_time', '0'); ini_set('max_input_time', '0'); diff --git a/usr/local/www/diag_confbak.php b/usr/local/www/diag_confbak.php index 0b87876..2015c91 100755 --- a/usr/local/www/diag_confbak.php +++ b/usr/local/www/diag_confbak.php @@ -27,6 +27,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: config +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-configurationhistory ##|*NAME=Diagnostics: Configuration History page @@ -34,7 +38,6 @@ ##|*MATCH=diag_confbak.php* ##|-PRIV - require("guiconfig.inc"); if($_GET['newver'] != "") { diff --git a/usr/local/www/diag_defaults.php b/usr/local/www/diag_defaults.php index 921a4e4..c462abd 100755 --- a/usr/local/www/diag_defaults.php +++ b/usr/local/www/diag_defaults.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_defaults.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: config +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-factorydefaults ##|*NAME=Diagnostics: Factory defaults page @@ -38,7 +42,6 @@ ##|*MATCH=diag_defaults.php* ##|-PRIV - require("guiconfig.inc"); if ($_POST) { diff --git a/usr/local/www/diag_dhcp_leases.php b/usr/local/www/diag_dhcp_leases.php index c79f309..1496685 100755 --- a/usr/local/www/diag_dhcp_leases.php +++ b/usr/local/www/diag_dhcp_leases.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_dhcp_leases.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/awk /bin/cat /usr/sbin/arp /usr/bin/wc /usr/bin/grep + pfSense_MODULE: dhcpserver +*/ + ##|+PRIV ##|*IDENT=page-status-dhcpleases ##|*NAME=Status: DHCP leases page @@ -38,7 +43,6 @@ ##|*MATCH=diag_dhcp_leases.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","DHCP leases"); @@ -111,9 +115,8 @@ $cleanpattern = "'{ gsub(\"#.*\", \"\");} { gsub(\";\", \"\"); print;}'"; $splitpattern = "'BEGIN { RS=\"}\";} {for (i=1; i<=NF; i++) printf \"%s \", \$i; printf \"}\\n\";}'"; /* stuff the leases file in a proper format into a array by line */ -exec("cat {$leasesfile} | {$awk} {$cleanpattern} | {$awk} {$splitpattern}", $leases_content); +exec("/bin/cat {$leasesfile} | {$awk} {$cleanpattern} | {$awk} {$splitpattern}", $leases_content); $leases_count = count($leases_content); - exec("/usr/sbin/arp -an", $rawdata); $arpdata = array(); foreach ($rawdata as $line) { @@ -272,9 +275,6 @@ foreach($config['interfaces'] as $ifname => $ifarr) { if ($_GET['order']) usort($leases, "leasecmp"); -?> - -<?php /* only print pool status when we have one */ if(count($pools) > 0) { ?> diff --git a/usr/local/www/diag_dns.php b/usr/local/www/diag_dns.php index d1be628..bc8dd6b 100644 --- a/usr/local/www/diag_dns.php +++ b/usr/local/www/diag_dns.php @@ -27,6 +27,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: dns +*/ + $pgtitle = "Diagnostics: DNS"; require("guiconfig.inc"); diff --git a/usr/local/www/diag_dump_states.php b/usr/local/www/diag_dump_states.php index 6c56b2f..c3818f6 100755 --- a/usr/local/www/diag_dump_states.php +++ b/usr/local/www/diag_dump_states.php @@ -1,7 +1,8 @@ <?php /* diag_dump_states.php - Copyright (C) 2005 Scott Ullrich, Colin Smith + Copyright (C) 2005-2009 Scott Ullrich + Copyright (C) 2005 Colin Smith All rights reserved. Redistribution and use in source and binary forms, with or without @@ -26,6 +27,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/pfctl + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-showstates ##|*NAME=Diagnostics: Show States page @@ -33,10 +39,8 @@ ##|*MATCH=diag_dump_states.php* ##|-PRIV - require_once("guiconfig.inc"); - /* handle AJAX operations */ if($_GET['action']) { if($_GET['action'] == "remove") { diff --git a/usr/local/www/diag_ipsec.php b/usr/local/www/diag_ipsec.php index 7422503..e5a7df1 100644 --- a/usr/local/www/diag_ipsec.php +++ b/usr/local/www/diag_ipsec.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_ipsec.php - Copyright (C) 2007 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich Copyright (C) 2008 Shrew Soft Inc <mgrooms@shrew.net>. All rights reserved. @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec ##|*NAME=Status: IPsec page @@ -132,8 +136,6 @@ $sad = ipsec_dump_sad(); <a href="vpn_ipsec.php">here</a>. </span> - <?php include("fend.inc"); ?> </body> </html> - diff --git a/usr/local/www/diag_ipsec_sad.php b/usr/local/www/diag_ipsec_sad.php index 4d67869..c61359a 100755 --- a/usr/local/www/diag_ipsec_sad.php +++ b/usr/local/www/diag_ipsec_sad.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_ipsec_sad.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/local/sbin/setkey + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec-sad ##|*NAME=Status: IPsec: SAD page @@ -38,7 +43,6 @@ ##|*MATCH=diag_ipsec_sad.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","IPsec","SAD"); diff --git a/usr/local/www/diag_ipsec_spd.php b/usr/local/www/diag_ipsec_spd.php index a910cae..7019c79 100755 --- a/usr/local/www/diag_ipsec_spd.php +++ b/usr/local/www/diag_ipsec_spd.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_ipsec_spd.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/local/sbin/setkey + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-ipsec-spd ##|*NAME=Status: IPsec: SPD page @@ -38,7 +43,6 @@ ##|*MATCH=diag_ipsec_spd.php* ##|-PRIV - require("guiconfig.inc"); $pgtitle = array("Status","IPsec","SPD"); diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 637ff4c..9a647e8 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: system +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-system ##|*NAME=Diagnostics: Logs: System page diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 413e223..ea12ac2 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -29,6 +29,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: captiveportal +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-portalauth ##|*NAME=Status: System logs: Portal Auth page @@ -81,10 +85,10 @@ include("head.inc"); </tr> <?php dump_clog($portal_logfile, $nentries, true); ?> <tr><td><br><form action="diag_logs_auth.php" method="post"> -<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> + <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> </table> </div> -</form> + </form> </td> </tr> </table> diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 07294cf..da0e3f8 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs_dhcp.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: dhcpserver +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-dhcp ##|*NAME=Diagnostics: Logs: DHCP page @@ -83,7 +87,7 @@ include("head.inc"); </tr> <?php dump_clog($dhcpd_logfile, $nentries); ?> <tr><td><br><form action="diag_logs_dhcp.php" method="post"> -<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> + <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> </table> </div> </form> diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index fa25c95..a09cdde 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -2,11 +2,12 @@ /* $Id$ */ /* diag_logs_filter.php - part of pfSesne by Scott Ullrich + part of pfSense + Copyright (C) 2004-2009 Scott Ullrich originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2009 Manuel Kasper <mk@neon1.net>, - Jim Pingle <myfirstname>@<mylastname>.org + Jim Pingle jim@pingle.org All rights reserved. Redistribution and use in source and binary forms, with or without @@ -31,6 +32,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-firewall ##|*NAME=Diagnostics: Logs: Firewall page diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index 3bcd9b0..b2f88ae 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -2,7 +2,8 @@ /* $Id$ */ /* diag_logs_filter.php - part of pfSesne by Scott Ullrich + part of pfSesne + Copyright (C) 2004-2009 Scott Ullrich originally based on m0n0wall (http://m0n0.ch/wall) Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. @@ -30,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-hidden-nolongerincluded ##|*NAME=Hidden: No longer included page diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index e0e5877..1b4cee1 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -1,7 +1,6 @@ <?php /* diag_logs_filter_summary.php - Copyright (C) 2009 Jim Pingle (jpingle@gmail.com) All rights reserved. @@ -27,6 +26,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: + pfSense_MODULE: filter +*/ + $pgtitle = "Diagnostics: System logs: Firewall Log Summary"; require_once("guiconfig.inc"); include_once("filter_log.inc"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 9563753..31fcc80 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/bin/awk + pfSense_MODULE: ipsec +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-ipsecvpn ##|*NAME=Status: System logs: IPsec VPN page @@ -52,7 +57,7 @@ if(is_array($config['ipsec']['phase1'])) $replace[] = "$1<strong>[{$ph1ent['descr']}]</strong>: $2$3$4"; } /* collect all our own ip addresses */ -exec("/sbin/ifconfig|/usr/bin/awk '/inet / {print $2}'", $ip_address_list); +exec("/sbin/ifconfig | /usr/bin/awk '/inet / {print $2}'", $ip_address_list); foreach($ip_address_list as $address) { $search[] = "/(racoon: )([A-Z:].*?)({$address}\[[0-9].+\])(.*isakmp.*)/i"; $replace[] = "$1<strong>[Self]</strong>: $2$3$4"; diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index 3674813..f11d92d 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -29,6 +29,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: ntpd +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-openntpd ##|*NAME=Status: System logs: OpenNTPD page diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index 5fdc7a3..a65367b 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originally part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: openvpn +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-openvpn ##|*NAME=Status: System logs: OpenVPN page diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index 5d84eed..fae75b3 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -30,6 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-loadbalancer ##|*NAME=Status: System logs: Load Balancer page diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 6c38f7a..6cd7fac 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_logs_settings.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: system +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-settings ##|*NAME=Diagnostics: Logs: Settings page diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index fb69648..0afa403 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -30,6 +30,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-status-systemlogs-loadbalancer ##|*NAME=Status: System logs: Load Balancer page @@ -82,7 +86,7 @@ include("head.inc"); </tr> <?php dump_clog($slbd_logfile, $nentries); ?> <tr><td><br><form action="diag_logs_slbd.php" method="post"> -<input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> + <input name="clear" type="submit" class="formbtn" value="Clear log"></td></tr> </table> </div> </form> diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 6f9965e..3d90cc4 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -29,6 +29,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/sbin/fifolog_reader /usr/sbin/clog + pfSense_MODULE: vpn +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-logs-pptpvpn ##|*NAME=Diagnostics: Logs: PPTP VPN page diff --git a/usr/local/www/diag_nanobsd.php b/usr/local/www/diag_nanobsd.php index 06f4c3e..754a354 100755 --- a/usr/local/www/diag_nanobsd.php +++ b/usr/local/www/diag_nanobsd.php @@ -26,6 +26,12 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/mount /sbin/glabel /usr/bin/grep /usr/bin/cut /usr/bin/head /bin/cp + pfSense_BUILDER_BINARIES: /usr/sbin/boot0cfg /bin/mkdir /sbin/fsck_ufs /sbin/mount /sbin/sysctl /bin/dd /sbin/tunefs + pfSense_MODULE: nanobsd +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-nanobsd ##|*NAME=Diagnostics: NanoBSD @@ -131,7 +137,7 @@ EOF; EOF; file_put_contents("/tmp/{$AGLABEL_SLICE}/etc/fstab", $fstab); exec("/sbin/umount /tmp/{$AGLABEL_SLICE}"); - exec("sysctl kern.geom.debugflags=0"); + exec("/sbin/sysctl kern.geom.debugflags=0"); conf_mount_ro(); $savemsg = "The boot slice has been set to {$BOOT_DRIVE} {$AGLABEL_SLICE}"; // Survey slice info @@ -150,8 +156,8 @@ echo <<<EOF EOF; for ($i = 0; $i < ob_get_level(); $i++) { ob_end_flush(); } ob_implicit_flush(1); - exec("sysctl kern.geom.debugflags=16"); - exec("dd if=/dev/zero of=/dev/{$TOFLASH} bs=1m count=1"); + exec("/sbin/sysctl kern.geom.debugflags=16"); + exec("/bin/dd if=/dev/zero of=/dev/{$TOFLASH} bs=1m count=1"); exec("/bin/dd if=/dev/{$BOOTFLASH} of=/dev/{$TOFLASH} bs=64k"); exec("/sbin/tunefs -L {$GLABEL_SLICE} /dev/{$COMPLETE_PATH}"); exec("/bin/mkdir /tmp/{$GLABEL_SLICE}"); @@ -166,7 +172,7 @@ EOF; $savemsg = "The slice has been duplicated.<p/>If you would like to boot from this newly duplicated slice please set it using the bootup information area."; exec("/sbin/umount /tmp/{$GLABEL_SLICE}"); } - exec("sysctl kern.geom.debugflags=0"); + exec("/sbin/sysctl kern.geom.debugflags=0"); // Re-Survey slice info detect_slice_info(); } diff --git a/usr/local/www/diag_packet_capture.php b/usr/local/www/diag_packet_capture.php index ab5c83c..51a4d9c 100644 --- a/usr/local/www/diag_packet_capture.php +++ b/usr/local/www/diag_packet_capture.php @@ -23,6 +23,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /bin/ps /usr/bin/grep /usr/sbin/tcpdump + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-packetcapture ##|*NAME=Diagnostics: Packet Capture page @@ -30,7 +35,6 @@ ##|*MATCH=diag_packet_capture.php* ##|-PRIV - $pgtitle = array("Diagnostics", "Packet Capture"); require_once("guiconfig.inc"); require_once("pfsense-utils.inc"); @@ -70,7 +74,7 @@ if ($_POST) { elseif ($_POST['stopbtn']!= "") { $action = "Stop"; - $processes_running = trim(shell_exec("ps axw -O pid= | grep tcpdump | grep $fn | grep -v pflog")); + $processes_running = trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep $fn | /usr/bin/grep -v pflog")); //explode processes into an array, (delimiter is new line) $processes_running_array = explode("\n", $processes_running); @@ -181,7 +185,7 @@ include("head.inc"); ?> <?php /*check to see if packet capture tcpdump is already running*/ - $processcheck = (trim(shell_exec("ps axw -O pid= | grep tcpdump | grep $fn | grep -v pflog"))); + $processcheck = (trim(shell_exec("/bin/ps axw -O pid= | /usr/bin/grep tcpdump | /usr/bin/grep $fn | /usr/bin/grep -v pflog"))); $processisrunning = false; diff --git a/usr/local/www/diag_patterns.php b/usr/local/www/diag_patterns.php index 551fc44..2e1d264 100755 --- a/usr/local/www/diag_patterns.php +++ b/usr/local/www/diag_patterns.php @@ -26,6 +26,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: shaper +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-patters ##|*NAME=Diagnostics: Patterns page @@ -33,7 +37,6 @@ ##|*MATCH=patterns.php* ##|-PRIV - require("guiconfig.inc"); //Move the upload file to /usr/local/share/protocols (is_uploaded_file must use tmp_name as argument) @@ -56,7 +59,6 @@ $pgtitle = array("Diagnostics","Add layer7 pattern"); include("head.inc"); ?> - <style> <!-- @@ -95,8 +97,6 @@ pre { <?php include("fbegin.inc"); ?> <p><strong>You can upload new layer7 patterns to your system!</strong></p> <?php if ($ulmsg) echo "<p class=\"red\"><strong>" . $ulmsg . "</strong></p>\n"; ?> - - <div id="niftyOutter"> <form action="diag_patterns.php" method="POST" enctype="multipart/form-data" name="frmPattern"> <table> @@ -124,7 +124,3 @@ pre { </form> </body> </html> - -<?php - -?> diff --git a/usr/local/www/diag_ping.php b/usr/local/www/diag_ping.php index 8a71f0c..0ce85e3 100755 --- a/usr/local/www/diag_ping.php +++ b/usr/local/www/diag_ping.php @@ -28,6 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /sbin/ping + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-ping ##|*NAME=Diagnostics: Ping page @@ -35,7 +40,6 @@ ##|*MATCH=diag_ping.php* ##|-PRIV - $pgtitle = array("Diagnostics", "Ping"); require("guiconfig.inc"); @@ -136,6 +140,8 @@ include("head.inc"); ?> </td> </tr> </table> -</form> -</td></tr></table> + </form> + </td> +</tr> +</table> <?php include("fend.inc"); ?> diff --git a/usr/local/www/diag_pkglogs.php b/usr/local/www/diag_pkglogs.php index c39ef34..d8f5436 100755 --- a/usr/local/www/diag_pkglogs.php +++ b/usr/local/www/diag_pkglogs.php @@ -37,6 +37,11 @@ */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/netstat + pfSense_MODULE: pkgs +*/ + ##|+PRIV ##|*IDENT=page-status-packagelogs ##|*NAME=Status: Package logs page @@ -44,9 +49,7 @@ ##|*MATCH=diag_pkglogs.php* ##|-PRIV - require("guiconfig.inc"); -//require_once("pkg-utils.inc"); if(!($nentries = $config['syslog']['nentries'])) $nentries = 50; diff --git a/usr/local/www/diag_resetstate.php b/usr/local/www/diag_resetstate.php index 4e203d5..d9ba3b0 100755 --- a/usr/local/www/diag_resetstate.php +++ b/usr/local/www/diag_resetstate.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_resetstate.php - Copyright (C) 2004 Scott Ullrich + Copyright (C) 2004-2009 Scott Ullrich All rights reserved. originially part of m0n0wall (http://m0n0.ch/wall) @@ -31,6 +31,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-resetstate ##|*NAME=Diagnostics: Reset state page @@ -38,7 +42,6 @@ ##|*MATCH=diag_resetstate.php* ##|-PRIV - require("guiconfig.inc"); if ($_POST) { diff --git a/usr/local/www/diag_routes.php b/usr/local/www/diag_routes.php index 1f581ac..c62aadb 100644 --- a/usr/local/www/diag_routes.php +++ b/usr/local/www/diag_routes.php @@ -29,6 +29,11 @@ */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/netstat + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-routingtables ##|*NAME=Diagnostics: Routing tables page @@ -36,7 +41,6 @@ ##|*MATCH=diag_routes.php* ##|-PRIV - include('guiconfig.inc'); $pgtitle = array("Diagnostics","Routing tables"); diff --git a/usr/local/www/diag_showbogons.php b/usr/local/www/diag_showbogons.php index 690e4de..68bcb96 100644 --- a/usr/local/www/diag_showbogons.php +++ b/usr/local/www/diag_showbogons.php @@ -27,6 +27,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /bin/ps /usr/bin/grep + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diag-showbogons ##|*NAME=Diagnostics: System Activity @@ -41,7 +46,7 @@ if($_POST['Download']) { $maxtimetowait = 0; $loading = true; while($loading == true) { - $isrunning = `ps awwwux | grep -v grep | grep bogons`; + $isrunning = `/bin/ps awwwux | /usr/bin/grep -v grep | /usr/bin/grep bogons`; if($isrunning == "") $loading = false; $maxtimetowait++; @@ -53,7 +58,7 @@ if($_POST['Download']) { $savemsg = "The bogons database has been updated."; } -$bogons = `cat /etc/bogons`; +$bogons = file_get_contents(trim("/etc/bogons")); $pgtitle = "Diagnostics: Show Bogons"; include("head.inc"); diff --git a/usr/local/www/diag_system_activity.php b/usr/local/www/diag_system_activity.php index 3529d48..bae83da 100644 --- a/usr/local/www/diag_system_activity.php +++ b/usr/local/www/diag_system_activity.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_cpu_activity.php - Copyright (C) 2008 Scott Ullrich + Copyright (C) 2008-2009 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,6 +27,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/bin/top + pfSense_MODULE: system +*/ + ##|+PRIV ##|*IDENT=page-diag-system-activity ##|*NAME=Diagnostics: System Activity @@ -41,7 +46,7 @@ $pfSversion = str_replace("\n", "", file_get_contents("/etc/version")); $pgtitle = "Diagnostics: System Activity"; if($_REQUEST['getactivity']) { - $text = `top`; + $text = `/usr/bin/top`; echo $text; exit; } diff --git a/usr/local/www/diag_system_pftop.php b/usr/local/www/diag_system_pftop.php index abdd7e3..6dcee5c 100644 --- a/usr/local/www/diag_system_pftop.php +++ b/usr/local/www/diag_system_pftop.php @@ -2,7 +2,7 @@ /* $Id$ */ /* diag_system_pftop.php - Copyright (C) 2008 Scott Ullrich + Copyright (C) 2008-2009 Scott Ullrich All rights reserved. Redistribution and use in source and binary forms, with or without @@ -27,6 +27,10 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_MODULE: filter +*/ + ##|+PRIV ##|*IDENT=page-diag-system-activity ##|*NAME=Diagnostics: System Activity diff --git a/usr/local/www/diag_traceroute.php b/usr/local/www/diag_traceroute.php index 9a9e96f..3530c60 100755 --- a/usr/local/www/diag_traceroute.php +++ b/usr/local/www/diag_traceroute.php @@ -28,6 +28,11 @@ POSSIBILITY OF SUCH DAMAGE. */ +/* + pfSense_BUILDER_BINARIES: /usr/sbin/traceroute + pfSense_MODULE: routing +*/ + ##|+PRIV ##|*IDENT=page-diagnostics-traceroute ##|*NAME=Diagnostics: Traceroute page @@ -35,11 +40,11 @@ ##|*MATCH=diag_traceroute.php* ##|-PRIV - - require("guiconfig.inc"); + $pgtitle = array("Diagnostics","Traceroute"); include("head.inc"); + ?> <body link="#000000" vlink="#000000" alink="#000000"> <? include("fbegin.inc"); ?> |