diff options
-rw-r--r-- | etc/inc/priv.defs.inc | 10 | ||||
-rwxr-xr-x | usr/local/www/diag_logs.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_auth.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_dhcp.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_filter_dynamic.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_filter_summary.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ipsec.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_ntpd.php | 1 | ||||
-rw-r--r-- | usr/local/www/diag_logs_openvpn.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_ppp.php | 124 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_relayd.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_settings.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_slbd.php | 1 | ||||
-rwxr-xr-x | usr/local/www/diag_logs_vpn.php | 1 | ||||
-rw-r--r-- | usr/local/www/help.php | 1 |
16 files changed, 2 insertions, 146 deletions
diff --git a/etc/inc/priv.defs.inc b/etc/inc/priv.defs.inc index b286039..2a4d31d 100644 --- a/etc/inc/priv.defs.inc +++ b/etc/inc/priv.defs.inc @@ -139,8 +139,8 @@ $priv_list['page-status-systemlogs-loadbalancer']['match'] = array(); $priv_list['page-status-systemlogs-loadbalancer']['match'][] = "diag_logs_slbd.php*"; $priv_list['page-diagnostics-logs-pptpvpn'] = array(); -$priv_list['page-diagnostics-logs-pptpvpn']['name'] = "WebCfg - Diagnostics: Logs: PPTP VPN page"; -$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = "Allow access to the 'Diagnostics: Logs: PPTP VPN' page."; +$priv_list['page-diagnostics-logs-pptpvpn']['name'] = "WebCfg - Diagnostics: Logs: VPN page"; +$priv_list['page-diagnostics-logs-pptpvpn']['descr'] = "Allow access to the 'Diagnostics: Logs: VPN' page."; $priv_list['page-diagnostics-logs-pptpvpn']['match'] = array(); $priv_list['page-diagnostics-logs-pptpvpn']['match'][] = "diag_logs_vpn.php*"; @@ -324,12 +324,6 @@ $priv_list['page-getstats']['descr'] = "Allow access to the 'AJAX: Get Stats' pa $priv_list['page-getstats']['match'] = array(); $priv_list['page-getstats']['match'][] = "getstats.php*"; -$priv_list['page-status-systemlogs-ppp'] = array(); -$priv_list['page-status-systemlogs-ppp']['name'] = "WebCfg - Status: System logs: IPsec VPN page"; -$priv_list['page-status-systemlogs-ppp']['descr'] = "Allow access to the 'Status: System logs: IPsec VPN' page."; -$priv_list['page-status-systemlogs-ppp']['match'] = array(); -$priv_list['page-status-systemlogs-ppp']['match'][] = "diag_logs_ppp.php*"; - $priv_list['page-diagnostics-nanobsd'] = array(); $priv_list['page-diagnostics-nanobsd']['name'] = "WebCfg - Diagnostics: NanoBSD"; $priv_list['page-diagnostics-nanobsd']['descr'] = "Allow access to the 'Diagnostics: NanoBSD' page."; diff --git a/usr/local/www/diag_logs.php b/usr/local/www/diag_logs.php index 0d03b91..360142a 100755 --- a/usr/local/www/diag_logs.php +++ b/usr/local/www/diag_logs.php @@ -79,7 +79,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_auth.php b/usr/local/www/diag_logs_auth.php index 700b6dc..25e92d6 100755 --- a/usr/local/www/diag_logs_auth.php +++ b/usr/local/www/diag_logs_auth.php @@ -67,7 +67,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", true, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_dhcp.php b/usr/local/www/diag_logs_dhcp.php index b95b969..0b94962 100755 --- a/usr/local/www/diag_logs_dhcp.php +++ b/usr/local/www/diag_logs_dhcp.php @@ -69,7 +69,6 @@ include("head.inc"); $tab_array[] = array("DHCP", true, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter.php b/usr/local/www/diag_logs_filter.php index 9d8d9cd..819a4ce 100755 --- a/usr/local/www/diag_logs_filter.php +++ b/usr/local/www/diag_logs_filter.php @@ -103,7 +103,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter_dynamic.php b/usr/local/www/diag_logs_filter_dynamic.php index a07b52b..a8ac4b5 100755 --- a/usr/local/www/diag_logs_filter_dynamic.php +++ b/usr/local/www/diag_logs_filter_dynamic.php @@ -102,7 +102,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_filter_summary.php b/usr/local/www/diag_logs_filter_summary.php index 115bb12..58be33e 100644 --- a/usr/local/www/diag_logs_filter_summary.php +++ b/usr/local/www/diag_logs_filter_summary.php @@ -186,7 +186,6 @@ include("head.inc"); ?> $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ipsec.php b/usr/local/www/diag_logs_ipsec.php index 039193b..33052b5 100755 --- a/usr/local/www/diag_logs_ipsec.php +++ b/usr/local/www/diag_logs_ipsec.php @@ -89,7 +89,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", true, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ntpd.php b/usr/local/www/diag_logs_ntpd.php index d168f70..033b6fc 100644 --- a/usr/local/www/diag_logs_ntpd.php +++ b/usr/local/www/diag_logs_ntpd.php @@ -67,7 +67,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_openvpn.php b/usr/local/www/diag_logs_openvpn.php index aa50856..73e6ed5 100644 --- a/usr/local/www/diag_logs_openvpn.php +++ b/usr/local/www/diag_logs_openvpn.php @@ -71,7 +71,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", true, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_ppp.php b/usr/local/www/diag_logs_ppp.php deleted file mode 100755 index 470d33d..0000000 --- a/usr/local/www/diag_logs_ppp.php +++ /dev/null @@ -1,124 +0,0 @@ -<?php -/* $Id$ */ -/* - diag_logs.php - Copyright (C) 2004-2009 Scott Ullrich - All rights reserved. - - originally part of m0n0wall (http://m0n0.ch/wall) - Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. - All rights reserved. - - Redistribution and use in source and binary forms, with or without - modification, are permitted provided that the following conditions are met: - - 1. Redistributions of source code must retain the above copyright notice, - this list of conditions and the following disclaimer. - - 2. Redistributions in binary form must reproduce the above copyright - notice, this list of conditions and the following disclaimer in the - documentation and/or other materials provided with the distribution. - - THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, - INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY - AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE - AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, - OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF - SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS - INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN - CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) - ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE - POSSIBILITY OF SUCH DAMAGE. -*/ - -/* - pfSense_BUILDER_BINARIES: /sbin/ifconfig /usr/bin/awk - pfSense_MODULE: -*/ - -##|+PRIV -##|*IDENT=page-status-systemlogs-ppp -##|*NAME=Status: System logs: IPsec VPN page -##|*DESCR=Allow access to the 'Status: System logs: IPsec VPN' page. -##|*MATCH=diag_logs_ppp.php* -##|-PRIV - -require("guiconfig.inc"); - -$ppp_logfile = "{$g['varlog_path']}/ppp.log"; - -$nentries = $config['syslog']['nentries']; -if (!$nentries) - $nentries = 50; - -if ($_POST['clear']) - clear_log_file($ppp_logfile); - -$ppp_logarr = return_clog($ppp_logfile, $nentries); - -$pgtitle = array("Status","System logs","PPP"); -include("head.inc"); - -?> -<body link="#0000CC" vlink="#0000CC" alink="#0000CC"> -<?php include("fbegin.inc"); ?> -<table width="100%" border="0" cellpadding="0" cellspacing="0"> - <tr> - <td> -<?php - $tab_array = array(); - $tab_array[] = array("System", false, "diag_logs.php"); - $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); - $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); - $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); - $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", true, "diag_logs_ppp.php"); - $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); - $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); - $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); - $tab_array[] = array("OpenNTPD", false, "diag_logs_ntpd.php"); - $tab_array[] = array("Settings", false, "diag_logs_settings.php"); - display_top_tabs($tab_array); -?> - </td> - </tr> - <tr> - <td> - <div id="mainarea"> - <table class="tabcont" width="100%" border="0" cellspacing="0" cellpadding="0"> - <tr> - <td colspan="2" class="listtopic">Last <?=$nentries;?> PPP log entries</td> - </tr> - <?php - foreach($ppp_logarr as $logent){ - if(isset($match)) { - $logent = preg_replace($search, $replace, $logent); - } else { - $searchs = "/(racoon: )([A-Z:].*?)([0-9].+\.[0-9].+.[0-9].+.[0-9].+\[[0-9].+\])(.*)/i"; - $replaces = "$1<strong><font color=red>[Unknown Gateway/Dynamic]</font></strong>: $2$3$4"; - $logent = preg_replace($searchs, $replaces, $logent); - } - $logent = preg_split("/\s+/", $logent, 6); - echo "<tr valign=\"top\">\n"; - $entry_date_time = htmlspecialchars(join(" ", array_slice($logent, 0, 3))); - echo "<td class=\"listlr\" nowrap>" . $entry_date_time . "</td>\n"; - echo "<td class=\"listr\">" . $logent[4] . " " . $logent[5] . "</td>\n"; - echo "</tr>\n"; - } - ?> - <tr> - <td> - <br> - <form action="diag_logs_ppp.php" method="post"> - <input name="clear" type="submit" class="formbtn" value="Clear log"> - </form> - </td> - </tr> - </table> - </div> - </td> - </tr> -</table> -<?php include("fend.inc"); ?> -</body> -</html> diff --git a/usr/local/www/diag_logs_relayd.php b/usr/local/www/diag_logs_relayd.php index f267c74..a7a52a0 100755 --- a/usr/local/www/diag_logs_relayd.php +++ b/usr/local/www/diag_logs_relayd.php @@ -67,7 +67,6 @@ include("head.inc"); $tab_array[] = array("Firewall", false, "diag_logs_filter.php"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", true, "diag_logs_relayd.php"); diff --git a/usr/local/www/diag_logs_settings.php b/usr/local/www/diag_logs_settings.php index f2b7861..93e1169 100755 --- a/usr/local/www/diag_logs_settings.php +++ b/usr/local/www/diag_logs_settings.php @@ -171,7 +171,6 @@ function enable_change(enable_over) { $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_slbd.php b/usr/local/www/diag_logs_slbd.php index c55809a..64ed3b2 100755 --- a/usr/local/www/diag_logs_slbd.php +++ b/usr/local/www/diag_logs_slbd.php @@ -68,7 +68,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", false, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", true, "diag_logs_slbd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/diag_logs_vpn.php b/usr/local/www/diag_logs_vpn.php index 83d0ecd..e0faf23 100755 --- a/usr/local/www/diag_logs_vpn.php +++ b/usr/local/www/diag_logs_vpn.php @@ -103,7 +103,6 @@ include("head.inc"); $tab_array[] = array("DHCP", false, "diag_logs_dhcp.php"); $tab_array[] = array("Portal Auth", false, "diag_logs_auth.php"); $tab_array[] = array("IPsec", false, "diag_logs_ipsec.php"); - $tab_array[] = array("PPP", false, "diag_logs_ppp.php"); $tab_array[] = array("VPN", true, "diag_logs_vpn.php"); $tab_array[] = array("Load Balancer", false, "diag_logs_relayd.php"); $tab_array[] = array("OpenVPN", false, "diag_logs_openvpn.php"); diff --git a/usr/local/www/help.php b/usr/local/www/help.php index a379753..2a07a5b 100644 --- a/usr/local/www/help.php +++ b/usr/local/www/help.php @@ -58,7 +58,6 @@ $helppages = array( 'diag_logs_filter_dynamic.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs', 'diag_logs_filter_summary.php' => 'http://doc.pfsense.org/index.php/Firewall_Logs', 'diag_logs_ntpd.php' => 'http://doc.pfsense.org/index.php/NTP_Logs', - 'diag_logs_ppp.php' => 'http://doc.pfsense.org/index.php/PPP_Logs', 'diag_logs_relayd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs', 'diag_logs_settings.php' => 'http://doc.pfsense.org/index.php/Log_Settings', 'diag_logs_slbd.php' => 'http://doc.pfsense.org/index.php/Load_Balancer_Logs', |