diff options
author | Bill Marquette <billm@pfsense.org> | 2005-04-04 00:33:49 +0000 |
---|---|---|
committer | Bill Marquette <billm@pfsense.org> | 2005-04-04 00:33:49 +0000 |
commit | 963d5343ba78c339d8e3a64209255d39880b7725 (patch) | |
tree | 82839fdf30da9dcba55715dd9256d68cd578a6a5 /usr/local/www | |
parent | 5d255aecf9244d5c4b2090a2d943e35276ab7e84 (diff) | |
download | pfsense-963d5343ba78c339d8e3a64209255d39880b7725.zip pfsense-963d5343ba78c339d8e3a64209255d39880b7725.tar.gz |
Cleanup paths
Standardize settings (262144 file lengths)
Move IPSEC VPN next to PPTP VPN
style cleanup
various other minor cleanups
Diffstat (limited to 'usr/local/www')
-rwxr-xr-x | usr/local/www/diag_logs.php | 14 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 14 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 14 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 21 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 16 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 6 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 16 |
7 files changed, 56 insertions, 45 deletions
diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 14fc6c1..f2fbfa4 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$system_logfile = "{$g['varlog_path']}/system.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 262144 {$g['varlog_path']}/system.log"); + exec("/usr/sbin/clog -i -s 262144 {$system_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | grep -v racoon | /usr/bin/tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | /usr/bin/grep -v racoon | /usr/bin/tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: System");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: System</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabact">System</li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -94,7 +96,7 @@ function dump_clog($logfile, $tail, $withorig = true) { <td colspan="2" class="listtopic"> Last <?=$nentries;?> system log entries</td> </tr> - <?php dump_clog("{$g['varlog_path']}/system.log", $nentries); ?> + <?php dump_clog($system_logfile, $nentries); ?> </table> <br><form action="diag_logs.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"> diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 5f87a8b..c3865f0 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -32,12 +32,14 @@ require("guiconfig.inc"); +$portal_logfile = "{$g['varlog_path']}/portalauth.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 32768 /var/log/portalauth.log"); + exec("/usr/sbin/clog -i -s 262144 {$portal_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -45,7 +47,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -65,22 +67,22 @@ function dump_clog($logfile, $tail, $withorig = true) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: Portal Auth");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: Portal Auth Logs</p> +<p class="pgtitle">Diagnostics: System logs: Portal Auth</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabact">Portal Auth</li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -92,7 +94,7 @@ function dump_clog($logfile, $tail, $withorig = true) { <td colspan="2" class="listtopic"> Last <?=$nentries;?> Portal Auth log entries</td> </tr> - <?php dump_clog("/var/log/portalauth.log", $nentries); ?> + <?php dump_clog($portal_logfile, $nentries); ?> </table> <br><form action="diag_logs_auth.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"> diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index 9e20785..01f7864 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$dhcpd_logfile = "{$g['varlog_path']}/dhcpd.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 32768 {$g['varlog_path']}/dhcpd.log"); + exec("/usr/sbin/clog -i -s 262144 {$dhcpd_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: DHCP");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: DHCP</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabact">DHCP</li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -94,7 +96,7 @@ function dump_clog($logfile, $tail, $withorig = true) { <td colspan="2" class="listtopic"> Last <?=$nentries;?> DHCP service log entries</td> </tr> - <?php dump_clog("{$g['varlog_path']}/dhcpd.log", $nentries); ?> + <?php dump_clog($dhcpd_logfile, $nentries); ?> </table> <br><form action="diag_logs_dhcp.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"> diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 9e87e74..f839486 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -33,15 +33,15 @@ require("guiconfig.inc"); -exec("/usr/sbin/tcpdump -n -e -ttt -r /var/log/pflog | logger -t pf -p local0.info "); +$filter_logfile = "{$g['varlog_path']}/filter.log"; +exec("/usr/sbin/tcpdump -n -e -ttt -r {$g['varlog_path']}/pflog | logger -t pf -p local0.info "); $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); - exec("/usr/sbin/clog -i -s 262144 /var/log/filter.log"); + exec("/usr/sbin/clog -i -s 262144 {$filter_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -49,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . "15000", $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -65,6 +65,7 @@ function dump_clog($logfile, $tail, $withorig = true) { } } +/* format filter logs */ function conv_clog($logfile, $tail) { global $g, $config; @@ -81,7 +82,7 @@ function conv_clog($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n 250000", $logarr); + exec("/usr/sbin/clog {$filter_logfile} | tail {$sor} -n {$tail}", $logarr); $filterlog = array(); @@ -157,22 +158,22 @@ function format_ipf_ip($ipfip) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: Firewall");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: Firewall</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabact">Firewall</li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -180,7 +181,7 @@ function format_ipf_ip($ipfip) { <tr> <td class="tabcont"> <?php if (!isset($config['syslog']['rawfilter'])): - $filterlog = conv_clog("/var/log/filter.log", $nentries); + $filterlog = conv_clog($filter_logfile, $nentries); ?> <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr> <td colspan="6" class="listtopic"> @@ -216,7 +217,7 @@ function format_ipf_ip($ipfip) { <td colspan="2" class="listtopic"> Last <?=$nentries;?> firewall log entries</td> </tr> - <?php dump_clog("/var/log/filter.log", $nentries, false); ?> + <?php dump_clog($filter_logfile, $nentries, false); ?> </table> <?php endif; ?> <br><form action="diag_logs_filter.php" method="post"> diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 7ca67a8..75eadcf 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$ipsec_logfile = "{$g['varlog_path']}/system.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 262144 {$g['varlog_path']}/system.log"); + exec("/usr/sbin/clog -i -s 262144 {$ipsec_logfile}"); } function dump_clog($logfile, $tail, $withorig = true) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail, $withorig = true) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | grep racoon | /usr/bin/tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | /usr/bin/grep racoon | /usr/bin/tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -67,22 +69,22 @@ function dump_clog($logfile, $tail, $withorig = true) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: IPSEC VPN");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: IPSEC VPN</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabact">ISPEC Vpn</li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabact">IPSEC VPN</li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -92,9 +94,9 @@ function dump_clog($logfile, $tail, $withorig = true) { <table width="100%" border="0" cellspacing="0" cellpadding="0"> <tr> <td colspan="2" class="listtopic"> - Last <?=$nentries;?> system log entries</td> + Last <?=$nentries;?> IPSEC log entries</td> </tr> - <?php dump_clog("{$g['varlog_path']}/system.log", $nentries); ?> + <?php dump_clog($ipsec_logfile, $nentries); ?> </table> <br><form action="diag_logs.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"> diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index 56537e4..2896a31 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -94,7 +94,7 @@ if ($_POST) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: Settings");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> <script language="JavaScript"> @@ -122,7 +122,7 @@ function enable_change(enable_over) { <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: Settings</p> <form action="diag_logs_settings.php" method="post" name="iform" id="iform"> <?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($savemsg) print_info_box($savemsg); ?> @@ -130,10 +130,10 @@ function enable_change(enable_over) { <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabinact"><a href="diag_logs_vpn.php">PPTP VPN</a></li> <li class="tabact">Settings</li> </ul> diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index b86bdd7..e4a3f1a 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -34,12 +34,14 @@ require("guiconfig.inc"); +$pptp_logfile = "{$g['varlog_path']}/vpn.log"; + $nentries = $config['syslog']['nentries']; if (!$nentries) $nentries = 50; if ($_POST['clear']) { - exec("/usr/sbin/clog -i -s 65536 /var/log/vpn.log"); + exec("/usr/sbin/clog -i -s 262144 {$pptp_logfile}"); } function dump_clog($logfile, $tail) { @@ -47,7 +49,7 @@ function dump_clog($logfile, $tail) { $sor = isset($config['syslog']['reverse']) ? "-r" : ""; - exec("/usr/sbin/clog " . $logfile . " | tail {$sor} -n " . $tail, $logarr); + exec("/usr/sbin/clog {$logfile} | tail {$sor} -n {$tail}", $logarr); foreach ($logarr as $logent) { $logent = preg_split("/\s+/", $logent, 6); @@ -71,22 +73,22 @@ function dump_clog($logfile, $tail) { <!DOCTYPE HTML PUBLIC "-//W3C//DTD HTML 4.01 Transitional//EN"> <html> <head> -<title><?=gentitle("Diagnostics: System logs");?></title> +<title><?=gentitle("Diagnostics: System logs: PPTP VPN");?></title> <meta http-equiv="Content-Type" content="text/html; charset=iso-8859-1"> <link href="gui.css" rel="stylesheet" type="text/css"> </head> <body link="#0000CC" vlink="#0000CC" alink="#0000CC"> <?php include("fbegin.inc"); ?> -<p class="pgtitle">Diagnostics: System logs</p> +<p class="pgtitle">Diagnostics: System logs: PPTP VPN</p> <table width="100%" border="0" cellpadding="0" cellspacing="0"> <tr><td> <ul id="tabnav"> <li class="tabinact"><a href="diag_logs.php">System</a></li> - <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC Vpn</a></li> <li class="tabinact"><a href="diag_logs_filter.php">Firewall</a></li> <li class="tabinact"><a href="diag_logs_dhcp.php">DHCP</a></li> <li class="tabinact"><a href="diag_logs_auth.php">Portal Auth</a></li> + <li class="tabinact"><a href="diag_logs_ipsec.php">IPSEC VPN</a></li> <li class="tabact">PPTP VPN</li> <li class="tabinact"><a href="diag_logs_settings.php">Settings</a></li> </ul> @@ -95,7 +97,7 @@ function dump_clog($logfile, $tail) { <td class="tabcont"> <table width="100%" border="0" cellpadding="0" cellspacing="0"><tr> <td colspan="4" class="listtopic"> - Last <?=$nentries;?> firewall log entries</td> + Last <?=$nentries;?> PPTP log entries</td> </tr> <tr> <td class="listhdrr">Time</td> @@ -103,7 +105,7 @@ function dump_clog($logfile, $tail) { <td class="listhdrr">User</td> <td class="listhdrr">IP address</td> </tr> - <?php dump_clog("/var/log/vpn.log", $nentries); ?> + <?php dump_clog($pptp_logfile, $nentries); ?> </table> <br><form action="diag_logs_vpn.php" method="post"> <input name="clear" type="submit" class="formbtn" value="Clear log"> |