diff options
Diffstat (limited to 'src/usr')
36 files changed, 534 insertions, 310 deletions
diff --git a/src/usr/local/www/bootstrap/css/pfSense-dark.css b/src/usr/local/www/bootstrap/css/pfSense-dark.css index 68b6891..63380de 100644 --- a/src/usr/local/www/bootstrap/css/pfSense-dark.css +++ b/src/usr/local/www/bootstrap/css/pfSense-dark.css @@ -302,30 +302,6 @@ a.list-group-item .list-group-item-heading, .list-group-item .list-group-item-he } /** create icon colors */ -.icon-black -{ - color: #000000; -} - -.icon-danger -{ - color: #F44336; -} - -.icon-success -{ - color: #5CB85C; -} - -.icon-warning { - color: #FDD835; -} - -.icon-primary -{ - color: #009688; -} - .bg-primary { color: #000; background-color: #009688; diff --git a/src/usr/local/www/bootstrap/css/pfSense.css b/src/usr/local/www/bootstrap/css/pfSense.css index 622ca6e..59ba403 100644 --- a/src/usr/local/www/bootstrap/css/pfSense.css +++ b/src/usr/local/www/bootstrap/css/pfSense.css @@ -471,33 +471,17 @@ footer a { overflow-x: auto; } -/** create icon colors */ -.icon-black -{ - color: #000000; -} - -.icon-danger -{ - color: #D9534F; -} - -.icon-success -{ - color: #5CB85C; -} - -.icon-primary -{ - color: #337AB7; +/** create text colors */ +.text-warning { + color: #F57F17; } -.icon-warning { - color: #FDD835; +.text-success { + color: #4CAF50; } -.text-warning { - color: #F57F17; +.text-danger { + color: #B71C1C; } .btn-success { diff --git a/src/usr/local/www/diag_backup.php b/src/usr/local/www/diag_backup.php index 2559367..98d5ff8 100644 --- a/src/usr/local/www/diag_backup.php +++ b/src/usr/local/www/diag_backup.php @@ -617,7 +617,7 @@ if ($savemsg) if (is_subsystem_dirty('restore')): ?> <br/> - <form action="reboot.php" method="post"> + <form action="diag_reboot.php" method="post"> <input name="Submit" type="hidden" value="Yes" /> <?=print_info_box(gettext("The firewall configuration has been changed.") . "<br />" . gettext("The firewall is now rebooting."))?> <br /> diff --git a/src/usr/local/www/halt.php b/src/usr/local/www/diag_halt.php index 846aeb9..b2a0e21 100755 --- a/src/usr/local/www/halt.php +++ b/src/usr/local/www/diag_halt.php @@ -1,6 +1,6 @@ <?php /* - halt.php + diag_halt.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -63,7 +63,7 @@ ##|*IDENT=page-diagnostics-haltsystem ##|*NAME=Diagnostics: Halt system ##|*DESCR=Allow access to the 'Diagnostics: Halt system' page. -##|*MATCH=halt.php* +##|*MATCH=diag_halt.php* ##|-PRIV // Set DEBUG to true to prevent the system_halt() function from being called @@ -107,7 +107,7 @@ if ($_SERVER['REQUEST_METHOD'] == 'POST') { <div class="panel-body"> <div class="content"> <p>Click "Halt" to halt the system immediately, or "No" to go to the system dashboard. (There will be a brief delay before the dashboard appears.)</p> - <form action="halt.php" method="post"> + <form action="diag_halt.php" method="post"> <input type="submit" class="btn btn-danger pull-center" name="save" value="Halt"> <a href="/" class="btn btn-default">No</a> </form> diff --git a/src/usr/local/www/diag_system_pftop.php b/src/usr/local/www/diag_pftop.php index 4191720..8537f91 100644 --- a/src/usr/local/www/diag_system_pftop.php +++ b/src/usr/local/www/diag_pftop.php @@ -1,6 +1,6 @@ <?php /* - diag_system_pftop.php + diag_pftop.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -61,7 +61,7 @@ ##|*IDENT=page-diagnostics-system-pftop ##|*NAME=Diagnostics: pfTop ##|*DESCR=Allows access to the 'Diagnostics: pfTop' page -##|*MATCH=diag_system_pftop.php* +##|*MATCH=diag_pftop.php* ##|-PRIV require("guiconfig.inc"); @@ -175,7 +175,7 @@ print $form; //<![CDATA[ function getpftopactivity() { $.ajax( - '/diag_system_pftop.php', + '/diag_pftop.php', { method: 'post', data: $(document.forms[0]).serialize(), diff --git a/src/usr/local/www/reboot.php b/src/usr/local/www/diag_reboot.php index 77642fb..d011a56 100755 --- a/src/usr/local/www/reboot.php +++ b/src/usr/local/www/diag_reboot.php @@ -1,6 +1,6 @@ <?php /* - reboot.php + diag_reboot.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -60,7 +60,7 @@ ##|*IDENT=page-diagnostics-rebootsystem ##|*NAME=Diagnostics: Reboot System ##|*DESCR=Allow access to the 'Diagnostics: Reboot System' page. -##|*MATCH=reboot.php* +##|*MATCH=diag_reboot.php* ##|-PRIV // Set DEBUG to true to prevent the system_reboot() function from being called @@ -137,7 +137,7 @@ events.push(function(){ <div class="panel-body"> <div class="content"> <p>Click "Reboot" to reboot the system immediately, or "No" to go to the system dashboard without rebooting. (There will be a brief delay before the dashboard appears.)</p> - <form action="reboot.php" method="post"> + <form action="diag_reboot.php" method="post"> <input type="submit" class="btn btn-danger pull-center" name="Submit" value="Reboot"> <a href="/" class="btn btn-default">No</a> </form> diff --git a/src/usr/local/www/easyrule.php b/src/usr/local/www/easyrule.php index bb62f38..7a73bab 100644 --- a/src/usr/local/www/easyrule.php +++ b/src/usr/local/www/easyrule.php @@ -109,7 +109,7 @@ if ($message) { ?> <?=gettext("This is the Easy Rule status page, mainly used to display errors when adding rules. " . "If you are seeing this, there apparently was not an error, and you navigated to the " . "page directly without telling it what to do"); ?>.<br /><br /> -<?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="diag_logs_filter.php"><?=gettext("Status"); ?> > <?=gettext("System Logs, " . +<?=gettext("This page is meant to be called from the block/pass buttons on the Firewall Logs page"); ?>, <a href="status_logs_filter.php"><?=gettext("Status"); ?> > <?=gettext("System Logs, " . "Firewall Tab"); ?></a>. <br /> <?php } ?> diff --git a/src/usr/local/www/firewall_rules.php b/src/usr/local/www/firewall_rules.php index 70371de..641f647 100644 --- a/src/usr/local/www/firewall_rules.php +++ b/src/usr/local/www/firewall_rules.php @@ -303,7 +303,7 @@ display_top_tabs($tab_array); ?> <tr id="antilockout"> <td></td> - <td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check icon-success"></i></td> + <td title="<?=gettext("traffic is passed")?>"><i class="fa fa-check text-success"></i></td> <td>*</td> <td>*</td> <td>*</td> @@ -321,7 +321,7 @@ display_top_tabs($tab_array); <?php if (isset($config['interfaces'][$if]['blockpriv'])): ?> <tr id="frrfc1918"> <td></td> - <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td> + <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td> <td>*</td> <td><?=gettext("RFC 1918 networks");?></td> <td>*</td> @@ -339,7 +339,7 @@ display_top_tabs($tab_array); <?php if (isset($config['interfaces'][$if]['blockbogons'])): ?> <tr id="frrfc1918"> <td></td> - <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times icon-danger"></i></td> + <td title="<?=gettext("traffic is blocked")?>"><i class="fa fa-times text-danger"></i></td> <td>*</td> <td><?=gettext("Reserved/not assigned by IANA");?></td> <td>*</td> @@ -375,16 +375,16 @@ for ($i = 0; isset($a_filter[$i]); $i++): <?php if ($filterent['type'] == "block") { - $iconfn = "times icon-danger"; + $iconfn = "times text-danger"; $title_text = gettext("traffic is blocked"); } else if ($filterent['type'] == "reject") { - $iconfn = "hand-stop-o icon-warning"; + $iconfn = "hand-stop-o text-warning"; $title_text = gettext("traffic is rejected"); } else if ($filterent['type'] == "match") { $iconfn = "filter"; $title_text = gettext("traffic is matched"); } else { - $iconfn = "check icon-success"; + $iconfn = "check text-success"; $title_text = gettext("traffic is passed"); } ?> @@ -691,10 +691,10 @@ for ($i = 0; isset($a_filter[$i]); $i++): <dl class="dl-horizontal responsive"> <!-- Legend --> <dt><?=gettext('Legend')?></dt> <dd></dd> - <dt><i class="fa fa-check icon-success"></i></dt> <dd><?=gettext("Pass");?></dd> + <dt><i class="fa fa-check text-success"></i></dt> <dd><?=gettext("Pass");?></dd> <dt><i class="fa fa-filter"></i></dt> <dd><?=gettext("Match");?></dd> - <dt><i class="fa fa-times icon-danger"></i></dt> <dd><?=gettext("Block");?></dd> - <dt><i class="fa fa-hand-stop-o icon-warning"></i></dt> <dd><?=gettext("Reject");?></dd> + <dt><i class="fa fa-times text-danger"></i></dt> <dd><?=gettext("Block");?></dd> + <dt><i class="fa fa-hand-stop-o text-warning"></i></dt> <dd><?=gettext("Reject");?></dd> <dt><i class="fa fa-tasks"></i></dt> <dd> <?=gettext("Log");?></dd> <dt><i class="fa fa-cog"></i></dt> <dd> <?=gettext("Advanced filter");?></dd> </dl> diff --git a/src/usr/local/www/firewall_rules_edit.php b/src/usr/local/www/firewall_rules_edit.php index 5190081..0da4ac9 100644 --- a/src/usr/local/www/firewall_rules_edit.php +++ b/src/usr/local/www/firewall_rules_edit.php @@ -1368,7 +1368,7 @@ $section->addInput(new Form_Checkbox( $pconfig['log'] ))->setHelp('Hint: the firewall has limited local log space. Don\'t turn on logging '. 'for everything. If you want to do a lot of logging, consider using a remote '. - 'syslog server (see the <a href="diag_logs_settings.php">Status: System logs: '. + 'syslog server (see the <a href="status_logs_settings.php">Status: System logs: '. 'Settings</a> page).'); $section->addInput(new Form_Input( diff --git a/src/usr/local/www/firewall_virtual_ip.php b/src/usr/local/www/firewall_virtual_ip.php index 7637278..b6b0e46 100644 --- a/src/usr/local/www/firewall_virtual_ip.php +++ b/src/usr/local/www/firewall_virtual_ip.php @@ -364,7 +364,7 @@ endforeach; <div id="infoblock"> <?=print_info_box(gettext('The virtual IP addresses defined on this page may be used in ') . '<a href="firewall_nat.php">' . gettext('NAT') . '</a>' . gettext(' mappings.') . '<br />' . - gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="carp_status.php">' . gettext('here') . '</a>', info)?> + gettext('You can check the status of your CARP Virtual IPs and interfaces ') . '<a href="status_carp.php">' . gettext('here') . '</a>', info)?> </div> <?php diff --git a/src/usr/local/www/guiconfig.inc b/src/usr/local/www/guiconfig.inc index 735c460..d9d3def 100644 --- a/src/usr/local/www/guiconfig.inc +++ b/src/usr/local/www/guiconfig.inc @@ -572,6 +572,7 @@ function clear_log_file($logfile = "/var/log/system.log", $restart_syslogd = tru touch($logfile); } else { $log_size = isset($config['syslog']['logfilesize']) ? $config['syslog']['logfilesize'] : "511488"; + $log_size = isset($config['syslog'][basename($logfile, '.log') . '_settings']['logfilesize']) ? $config['syslog'][basename($logfile, '.log') . '_settings']['logfilesize'] : $log_size; if (isset($config['system']['usefifolog'])) { exec("/usr/sbin/fifolog_create -s {$log_size} " . escapeshellarg($logfile)); } else { @@ -602,6 +603,9 @@ function clear_all_log_files() { function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "") { global $g, $config; $sor = isset($config['syslog']['reverse']) ? "-r" : ""; + $specific_log = basename($logfile, '.log') . '_settings'; + if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $sor = ""; + if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $sor = "-r"; $logarr = ""; $grepline = " "; if (is_array($grepfor)) @@ -651,6 +655,9 @@ function dump_clog_no_table($logfile, $tail, $withorig = true, $grepfor = "", $g function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "") { global $g, $config; $sor = isset($config['syslog']['reverse']) ? "-r" : ""; + $specific_log = basename($logfile, '.log') . '_settings'; + if ($config['syslog'][$specific_log]['cronorder'] == 'forward') $sor = ""; + if ($config['syslog'][$specific_log]['cronorder'] == 'reverse') $sor = "-r"; $logarr = ""; $grepline = " "; if (is_array($grepfor)) { @@ -702,6 +709,9 @@ function dump_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert function return_clog($logfile, $tail, $withorig = true, $grepfor = "", $grepinvert = "", $grepreverse = false) { global $g, $config; $sor = (isset($config['syslog']['reverse']) || $grepreverse) ? "-r" : ""; + $specific_log = basename($logfile, '.log') . '_settings'; + if (($config['syslog'][$specific_log]['cronorder'] == 'forward') && !$grepreverse) $sor = ""; + if (($config['syslog'][$specific_log]['cronorder'] == 'reverse') || $grepreverse) $sor = "-r"; $logarr = ""; $grepline = " "; if (is_array($grepfor)) { diff --git a/src/usr/local/www/head.inc b/src/usr/local/www/head.inc index 25fc08b..0fb30e6 100755 --- a/src/usr/local/www/head.inc +++ b/src/usr/local/www/head.inc @@ -255,7 +255,7 @@ $services_menu[] = array(gettext("Dynamic DNS"), "/services_dyndns.php"); $services_menu[] = array(gettext("IGMP Proxy"), "/services_igmpproxy.php"); $services_menu[] = array(gettext("Load Balancer"), "/load_balancer_pool.php"); $services_menu[] = array(gettext("NTP"), "/services_ntpd.php"); -$services_menu[] = array(gettext("PPPoE Server"), "/vpn_pppoe.php"); +$services_menu[] = array(gettext("PPPoE Server"), "/services_pppoe.php"); $services_menu[] = array(gettext("SNMP"), "/services_snmp.php"); if (count($config['interfaces']) > 1) { @@ -279,26 +279,26 @@ $vpn_menu = msort(array_merge($vpn_menu, return_ext_menu("VPN")), 0); // Status $status_menu = array(); $status_menu[] = array(gettext("Captive Portal"), "/status_captiveportal.php"); -$status_menu[] = array(gettext("CARP (failover)"), "/carp_status.php"); +$status_menu[] = array(gettext("CARP (failover)"), "/status_carp.php"); $status_menu[] = array(gettext("Dashboard"), "/index.php"); $status_menu[] = array(gettext("Gateways"), "/status_gateways.php"); $status_menu[] = array(gettext("DHCP Leases"), "/status_dhcp_leases.php"); $status_menu[] = array(gettext("DHCPv6 Leases"), "/status_dhcpv6_leases.php"); $status_menu[] = array(gettext("Filter Reload"), "/status_filter_reload.php"); $status_menu[] = array(gettext("Interfaces"), "/status_interfaces.php"); -$status_menu[] = array(gettext("IPsec"), "/diag_ipsec.php"); +$status_menu[] = array(gettext("IPsec"), "/status_ipsec.php"); $status_menu[] = array(gettext("Load Balancer"), "/status_lb_pool.php"); $status_menu[] = array(gettext("NTP"), "/status_ntpd.php"); $status_menu[] = array(gettext("OpenVPN"), "/status_openvpn.php"); if ($g['platform'] == $g['product_name']) { - $status_menu[] = array(gettext("Package Logs"), "/diag_pkglogs.php"); + $status_menu[] = array(gettext("Package Logs"), "/status_pkglogs.php"); } $status_menu[] = array(gettext("Queues"), "/status_queues.php"); $status_menu[] = array(gettext("RRD Graphs"), "/status_rrd_graph.php"); $status_menu[] = array(gettext("Services"), "/status_services.php"); -$status_menu[] = array(gettext("System Logs"), "/diag_logs.php"); +$status_menu[] = array(gettext("System Logs"), "/status_logs.php"); $status_menu[] = array(gettext("Traffic Graph"), "/status_graph.php?if=wan"); if (count($config['interfaces']) > 1) { @@ -333,15 +333,15 @@ if (file_exists("/var/run/gmirror_active")) { $diagnostics_menu[] = array(gettext("GEOM Mirrors"), "/diag_gmirror.php"); } -$diagnostics_menu[] = array(gettext("Halt System"), "/halt.php"); +$diagnostics_menu[] = array(gettext("Halt System"), "/diag_halt.php"); $diagnostics_menu[] = array(gettext("Limiter Info"), "/diag_limiter_info.php"); $diagnostics_menu[] = array(gettext("NDP Table"), "/diag_ndp.php"); $diagnostics_menu[] = array(gettext("Tables"), "/diag_tables.php"); $diagnostics_menu[] = array(gettext("Ping"), "/diag_ping.php"); $diagnostics_menu[] = array(gettext("Test Port"), "/diag_testport.php"); $diagnostics_menu[] = array(gettext("pfInfo"), "/diag_pf_info.php"); -$diagnostics_menu[] = array(gettext("pfTop"), "/diag_system_pftop.php"); -$diagnostics_menu[] = array(gettext("Reboot"), "/reboot.php"); +$diagnostics_menu[] = array(gettext("pfTop"), "/diag_pftop.php"); +$diagnostics_menu[] = array(gettext("Reboot"), "/diag_reboot.php"); $diagnostics_menu[] = array(gettext("Routes"), "/diag_routes.php"); $diagnostics_menu[] = array(gettext("SMART Status"), "/diag_smart.php"); $diagnostics_menu[] = array(gettext("Sockets"), "/diag_sockets.php"); diff --git a/src/usr/local/www/help.php b/src/usr/local/www/help.php index 70e0c6c..485e33f 100644 --- a/src/usr/local/www/help.php +++ b/src/usr/local/www/help.php @@ -79,7 +79,7 @@ $helppages = array( 'interfaces_vlan_edit.php' => 'https://doc.pfsense.org/index.php/VLAN_Trunking', 'diag_routes.php' => 'https://doc.pfsense.org/index.php/Viewing_Routes', 'diag_packet_capture.php' => 'https://doc.pfsense.org/index.php/Sniffers,_Packet_Capture', - 'diag_system_pftop.php' => 'https://doc.pfsense.org/index.php/How_can_I_monitor_bandwidth_usage#pftop', + 'diag_pftop.php' => 'https://doc.pfsense.org/index.php/How_can_I_monitor_bandwidth_usage#pftop', 'status_rrd_graph.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs', 'status_rrd_graph_img.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs', 'status_rrd_graph_settings.php' => 'https://doc.pfsense.org/index.php/RRD_Graphs', @@ -98,22 +98,22 @@ $helppages = array( 'diag_dns.php' => 'https://doc.pfsense.org/index.php/DNS_Lookup', 'diag_dump_states.php' => 'https://doc.pfsense.org/index.php/Show_States', 'diag_resetstate.php' => 'https://doc.pfsense.org/index.php/Reset_States', - 'diag_logs.php' => 'https://doc.pfsense.org/index.php/System_Logs', + 'status_logs.php' => 'https://doc.pfsense.org/index.php/System_Logs', 'diag_logs_auth.php' => 'https://doc.pfsense.org/index.php/Captive_Portal_Authentication_Logs', 'diag_logs_dhcp.php' => 'https://doc.pfsense.org/index.php/DHCP_Logs', - 'diag_logs_filter.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', - 'diag_logs_filter_dynamic.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', - 'diag_logs_filter_summary.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', + 'status_logs_filter.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', + 'status_logs_filter_dynamic.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', + 'status_logs_filter_summary.php' => 'https://doc.pfsense.org/index.php/Firewall_Logs', 'diag_logs_ntpd.php' => 'https://doc.pfsense.org/index.php/NTP_Logs', 'diag_logs_ppp.php' => 'https://doc.pfsense.org/index.php/PPP_Logs', 'diag_logs_relayd.php' => 'https://doc.pfsense.org/index.php/Load_Balancer_Logs', - 'diag_logs_settings.php' => 'https://doc.pfsense.org/index.php/Log_Settings', - 'diag_logs_vpn.php' => 'https://doc.pfsense.org/index.php/PPTP_VPN_Logs', + 'status_logs_settings.php' => 'https://doc.pfsense.org/index.php/Log_Settings', + 'status_logs_vpn.php' => 'https://doc.pfsense.org/index.php/PPTP_VPN_Logs', 'diag_logs_ipsec.php' => 'https://doc.pfsense.org/index.php/IPsec_Logs', 'diag_logs_openvpn.php' => 'https://doc.pfsense.org/index.php/OpenVPN_Logs', 'diag_nanobsd.php' => 'https://doc.pfsense.org/index.php/NanoBSD_Diagnostics', 'diag_ping.php' => 'https://doc.pfsense.org/index.php/Ping_Host', - 'diag_pkglogs.php' => 'https://doc.pfsense.org/index.php/Package_Logs', + 'status_pkglogs.php' => 'https://doc.pfsense.org/index.php/Package_Logs', 'diag_tables.php' => 'https://doc.pfsense.org/index.php/Tables', 'diag_system_activity.php' => 'https://doc.pfsense.org/index.php/System_Activity', 'diag_traceroute.php' => 'https://doc.pfsense.org/index.php/Traceroute', @@ -122,8 +122,8 @@ $helppages = array( 'exec.php' => 'https://doc.pfsense.org/index.php/Execute_Command', 'firewall_nat_1to1.php' => 'https://doc.pfsense.org/index.php/1:1_NAT', 'firewall_nat_1to1_edit.php' => 'https://doc.pfsense.org/index.php/1:1_NAT', - 'halt.php' => 'https://doc.pfsense.org/index.php/Halt_System', - 'reboot.php' => 'https://doc.pfsense.org/index.php/Reboot_System', + 'diag_halt.php' => 'https://doc.pfsense.org/index.php/Halt_System', + 'diag_reboot.php' => 'https://doc.pfsense.org/index.php/Reboot_System', 'status_filter_reload.php' => 'https://doc.pfsense.org/index.php/Filter_Reload_Status', 'status_gateway_groups.php' => 'https://doc.pfsense.org/index.php/Gateway_Status', 'status_gateways.php' => 'https://doc.pfsense.org/index.php/Gateway_Status', @@ -194,17 +194,17 @@ $helppages = array( 'vpn_l2tp.php' => 'https://doc.pfsense.org/index.php/L2TP_VPN_Settings', 'vpn_l2tp_users.php' => 'https://doc.pfsense.org/index.php/L2TP_VPN_Settings', 'vpn_l2tp_users_edit.php' => 'https://doc.pfsense.org/index.php/L2TP_VPN_Settings', - 'vpn_pppoe.php' => 'https://doc.pfsense.org/index.php/PPPoE_Server_Settings', - 'vpn_pppoe_edit.php' => 'https://doc.pfsense.org/index.php/PPPoE_Server_Settings', + 'services_pppoe.php' => 'https://doc.pfsense.org/index.php/PPPoE_Server_Settings', + 'services_pppoe_edit.php' => 'https://doc.pfsense.org/index.php/PPPoE_Server_Settings', 'vpn_pptp.php' => 'https://doc.pfsense.org/index.php/PPTP_VPN_Settings', 'vpn_pptp_users.php' => 'https://doc.pfsense.org/index.php/PPTP_VPN_Settings', 'vpn_pptp_users_edit.php' => 'https://doc.pfsense.org/index.php/PPTP_VPN_Settings', - 'diag_ipsec.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', - 'diag_ipsec_sad.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', - 'diag_ipsec_spd.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', + 'status_ipsec.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', + 'status_ipsec_sad.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', + 'status_ipsec_spd.php' => 'https://doc.pfsense.org/index.php/IPsec_Status', 'vpn_ipsec.php' => 'https://doc.pfsense.org/index.php/IPsec_Tunnels', 'vpn_ipsec_mobile.php' => 'https://doc.pfsense.org/index.php/IPsec_Mobile_Clients', - 'diag_ipsec_leases.php' => 'https://doc.pfsense.org/index.php/IPsec_Mobile_Clients', + 'status_ipsec_leases.php' => 'https://doc.pfsense.org/index.php/IPsec_Mobile_Clients', 'vpn_ipsec_phase1.php' => 'https://doc.pfsense.org/index.php/IPsec_Tunnels', 'vpn_ipsec_phase2.php' => 'https://doc.pfsense.org/index.php/IPsec_Tunnels', 'vpn_ipsec_keys.php' => 'https://doc.pfsense.org/index.php/IPsec_Tunnels', @@ -270,7 +270,7 @@ $helppages = array( 'services_dhcpv6.php' => 'https://doc.pfsense.org/index.php/DHCPv6_Server', 'services_dhcpv6_edit.php' => 'https://doc.pfsense.org/index.php/DHCPv6_Server', 'services_router_advertisements.php' => 'https://doc.pfsense.org/index.php/Router_Advertisements', - 'carp_status.php' => 'https://doc.pfsense.org/index.php/CARP_Status', + 'status_carp.php' => 'https://doc.pfsense.org/index.php/CARP_Status', 'system_hasync.php' => 'https://doc.pfsense.org/index.php/High_Availability', 'services_unbound.php' => 'https://doc.pfsense.org/index.php/Unbound_DNS_Resolver', 'services_unbound_advanced.php' => 'https://doc.pfsense.org/index.php/Unbound_DNS_Resolver#Advanced_Settings_Tab', diff --git a/src/usr/local/www/vpn_pppoe.php b/src/usr/local/www/services_pppoe.php index 14aea1f..d6082ef 100644 --- a/src/usr/local/www/vpn_pppoe.php +++ b/src/usr/local/www/services_pppoe.php @@ -1,6 +1,6 @@ <?php /* - vpn_pppoe.php + services_pppoe.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -60,7 +60,7 @@ ##|*IDENT=page-services-pppoeserver ##|*NAME=Services: PPPoE Server ##|*DESCR=Allow access to the 'Services: PPPoE Server' page. -##|*MATCH=vpn_pppoe.php* +##|*MATCH=services_pppoe.php* ##|-PRIV require_once("guiconfig.inc"); @@ -111,7 +111,7 @@ if ($_GET['act'] == "del") { } unset($a_pppoes[$_GET['id']]); write_config(); - header("Location: vpn_pppoe.php"); + header("Location: services_pppoe.php"); exit; } } @@ -157,8 +157,8 @@ foreach ($a_pppoes as $pppoe): <?=htmlspecialchars($pppoe['descr'])?> </td> <td> - <a class="fa fa-pencil" title="<?=gettext('Edit PPPoE instance')?>" href="vpn_pppoe_edit.php?id=<?=$i?>"></a> - <a class="fa fa-trash" title="<?=gettext('Delete PPPoE instance')?>" href="vpn_pppoe.php?act=del&id=<?=$i?>"></a> + <a class="fa fa-pencil" title="<?=gettext('Edit PPPoE instance')?>" href="services_pppoe_edit.php?id=<?=$i?>"></a> + <a class="fa fa-trash" title="<?=gettext('Delete PPPoE instance')?>" href="services_pppoe.php?act=del&id=<?=$i?>"></a> </td> </tr> <?php @@ -170,7 +170,7 @@ endforeach; </div> <nav class="action-buttons"> - <a href="vpn_pppoe_edit.php" class="btn btn-success"> + <a href="services_pppoe_edit.php" class="btn btn-success"> <i class="fa fa-plus icon-embed-btn"></i> <?=gettext("Add")?> </a> diff --git a/src/usr/local/www/vpn_pppoe_edit.php b/src/usr/local/www/services_pppoe_edit.php index e03757c..f358749 100644 --- a/src/usr/local/www/vpn_pppoe_edit.php +++ b/src/usr/local/www/services_pppoe_edit.php @@ -1,6 +1,6 @@ <?php /* - vpn_pppoe_edit.php + services_pppoe_edit.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -57,7 +57,7 @@ ##|*IDENT=page-services-pppoeserver-edit ##|*NAME=Services: PPPoE Server: Edit ##|*DESCR=Allow access to the 'Services: PPPoE Server: Edit' page. -##|*MATCH=vpn_pppoe_edit.php* +##|*MATCH=services_pppoe_edit.php* ##|-PRIV require("guiconfig.inc"); @@ -282,7 +282,7 @@ if ($_POST) { write_config(); mark_subsystem_dirty('vpnpppoe'); file_put_contents("{$g['tmp_path']}/.vpn_pppoe.apply", serialize($toapplylist)); - header("Location: vpn_pppoe.php"); + header("Location: services_pppoe.php"); exit; } } diff --git a/src/usr/local/www/services_wol.php b/src/usr/local/www/services_wol.php index e6e3b5c..c624c98 100644 --- a/src/usr/local/www/services_wol.php +++ b/src/usr/local/www/services_wol.php @@ -89,7 +89,7 @@ if($_GET['wakeall'] != "") { if (!mwexec("/usr/local/bin/wol -i {$bcip} {$mac}")) { $savemsg .= sprintf(gettext('Sent magic packet to %1$s (%2$s)%3$s'), $mac, $description, ".<br />"); } else { - $savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully%5$s'), '<a href="/diag_logs.php">', '</a>', $description, $mac, ".<br />"); + $savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s (%4$s) did not complete successfully%5$s'), '<a href="/status_logs.php">', '</a>', $description, $mac, ".<br />"); } } } @@ -128,7 +128,7 @@ if ($_POST || $_GET['mac']) { if (!mwexec("/usr/local/bin/wol -i {$bcip} " . escapeshellarg($mac))) { $savemsg .= sprintf(gettext("Sent magic packet to %s."), $mac); } else { - $savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully%4$s'), '<a href="/diag_logs.php">', '</a>', $mac, ".<br />"); + $savemsg .= sprintf(gettext('Please check the %1$ssystem log%2$s, the wol command for %3$s did not complete successfully%4$s'), '<a href="/status_logs.php">', '</a>', $mac, ".<br />"); } } } diff --git a/src/usr/local/www/shortcuts.inc b/src/usr/local/www/shortcuts.inc index d21c171..e0a95bc 100644 --- a/src/usr/local/www/shortcuts.inc +++ b/src/usr/local/www/shortcuts.inc @@ -182,70 +182,70 @@ if (is_dir("/usr/local/pkg/shortcuts")) { $shortcuts['relayd'] = array(); $shortcuts['relayd']['main'] = "load_balancer_pool.php"; -$shortcuts['relayd']['log'] = "diag_logs.php?logfile=relayd"; +$shortcuts['relayd']['log'] = "status_logs.php?logfile=relayd"; $shortcuts['relayd']['status'] = "status_lb_pool.php"; $shortcuts['relayd']['service'] = "relayd"; $shortcuts['relayd-virtualservers'] = array(); $shortcuts['relayd-virtualservers']['main'] = "load_balancer_virtual_server.php"; -$shortcuts['relayd-virtualservers']['log'] = "diag_logs.php?logfile=relayd"; +$shortcuts['relayd-virtualservers']['log'] = "status_logs.php?logfile=relayd"; $shortcuts['relayd-virtualservers']['status'] = "status_lb_vs.php"; $shortcuts['relayd-virtualservers']['service'] = "relayd"; $shortcuts['captiveportal'] = array(); $shortcuts['captiveportal']['main'] = "services_captiveportal_zones.php"; -$shortcuts['captiveportal']['log'] = "diag_logs.php?logfile=portalauth"; +$shortcuts['captiveportal']['log'] = "status_logs.php?logfile=portalauth"; $shortcuts['captiveportal']['status'] = "status_captiveportal.php"; $shortcuts['captiveportal']['service'] = "captiveportal"; $shortcuts['captiveportal-vouchers'] = array(); -$shortcuts['captiveportal-vouchers']['log'] = "diag_logs.php?logfile=auth"; +$shortcuts['captiveportal-vouchers']['log'] = "status_logs.php?logfile=auth"; $shortcuts['captiveportal-vouchers']['status'] = "status_captiveportal_vouchers.php"; $shortcuts['captiveportal-vouchers']['service'] = "captiveportal"; $shortcuts['dhcp'] = array(); $shortcuts['dhcp']['main'] = "services_dhcp.php"; -$shortcuts['dhcp']['log'] = "diag_logs.php?logfile=dhcpd"; +$shortcuts['dhcp']['log'] = "status_logs.php?logfile=dhcpd"; $shortcuts['dhcp']['status'] = "status_dhcp_leases.php"; $shortcuts['dhcp']['service'] = "dhcpd"; $shortcuts['dhcp6'] = array(); $shortcuts['dhcp6']['main'] = "services_dhcpv6.php"; -$shortcuts['dhcp6']['log'] = "diag_logs.php?logfile=dhcp"; +$shortcuts['dhcp6']['log'] = "status_logs.php?logfile=dhcp"; $shortcuts['dhcp6']['status'] = "status_dhcpv6_leases.php"; $shortcuts['ipsec'] = array(); $shortcuts['ipsec']['main'] = "vpn_ipsec.php"; -$shortcuts['ipsec']['log'] = "diag_logs.php?logfile=ipsec"; -$shortcuts['ipsec']['status'] = "diag_ipsec.php"; +$shortcuts['ipsec']['log'] = "status_logs.php?logfile=ipsec"; +$shortcuts['ipsec']['status'] = "status_ipsec.php"; $shortcuts['ipsec']['service'] = "ipsec"; $shortcuts['openvpn'] = array(); $shortcuts['openvpn']['main'] = "vpn_openvpn_server.php"; -$shortcuts['openvpn']['log'] = "diag_logs.php?logfile=openvpn"; +$shortcuts['openvpn']['log'] = "status_logs.php?logfile=openvpn"; $shortcuts['openvpn']['status'] = "status_openvpn.php"; $shortcuts['openvpn']['service'] = "openvpn"; $shortcuts['firewall'] = array(); $shortcuts['firewall']['main'] = "firewall_rules.php"; -$shortcuts['firewall']['log'] = "diag_logs_filter.php"; +$shortcuts['firewall']['log'] = "status_logs_filter.php"; $shortcuts['firewall']['status'] = "status_filter_reload.php"; $shortcuts['routing'] = array(); $shortcuts['routing']['main'] = "system_routes.php"; -$shortcuts['routing']['log'] = "diag_logs.php?logfile=routing"; +$shortcuts['routing']['log'] = "status_logs.php?logfile=routing"; $shortcuts['routing']['status'] = "diag_routes.php"; $shortcuts['gateways'] = array(); $shortcuts['gateways']['main'] = "system_gateways.php"; -$shortcuts['gateways']['log'] = "diag_logs.php?logfile=gateways"; +$shortcuts['gateways']['log'] = "status_logs.php?logfile=gateways"; $shortcuts['gateways']['status'] = "status_gateways.php"; $shortcuts['gateways']['service'] = "dpinger"; $shortcuts['gateway-groups'] = array(); $shortcuts['gateway-groups']['main'] = "system_gateway_groups.php"; -$shortcuts['gateway-groups']['log'] = "diag_logs.php?logfile=gateways"; +$shortcuts['gateway-groups']['log'] = "status_logs.php?logfile=gateways"; $shortcuts['gateway-groups']['status'] = "status_gateway_groups.php"; $shortcuts['interfaces'] = array(); @@ -262,36 +262,36 @@ $shortcuts['trafficshaper-limiters']['status'] = "diag_limiter_info.php"; $shortcuts['forwarder'] = array(); $shortcuts['forwarder']['main'] = "services_dnsmasq.php"; -$shortcuts['forwarder']['log'] = "diag_logs.php?logfile=resolver"; +$shortcuts['forwarder']['log'] = "status_logs.php?logfile=resolver"; $shortcuts['forwarder']['service'] = "dnsmasq"; $shortcuts['resolver'] = array(); $shortcuts['resolver']['main'] = "services_unbound.php"; -$shortcuts['resolver']['log'] = "diag_logs.php?logfile=resolver"; +$shortcuts['resolver']['log'] = "status_logs.php?logfile=resolver"; $shortcuts['resolver']['service'] = "unbound"; $shortcuts['wireless'] = array(); $shortcuts['wireless']['main'] = "interfaces_wireless.php"; -$shortcuts['wireless']['log'] = "diag_logs.php?logfile=wireless"; +$shortcuts['wireless']['log'] = "status_logs.php?logfile=wireless"; $shortcuts['wireless']['status'] = "status_wireless.php"; $shortcuts['ntp'] = array(); $shortcuts['ntp']['main'] = "services_ntpd.php"; -$shortcuts['ntp']['log'] = "diag_logs.php?logfile=ntpd"; +$shortcuts['ntp']['log'] = "status_logs.php?logfile=ntpd"; $shortcuts['ntp']['status'] = "status_ntpd.php"; $shortcuts['ntp']['service'] = "ntpd"; $shortcuts['pptps'] = array(); $shortcuts['pptps']['main'] = "vpn_pptp.php"; -$shortcuts['pptps']['log'] = "diag_logs_vpn.php"; +$shortcuts['pptps']['log'] = "status_logs_vpn.php"; $shortcuts['pppoes'] = array(); -$shortcuts['pppoes']['main'] = "vpn_pppoe.php"; -$shortcuts['pppoes']['log'] = "diag_logs_vpn.php?vpntype=poes"; +$shortcuts['pppoes']['main'] = "services_pppoe.php"; +$shortcuts['pppoes']['log'] = "status_logs_vpn.php?vpntype=poes"; $shortcuts['l2tps'] = array(); $shortcuts['l2tps']['main'] = "vpn_l2tp.php"; -$shortcuts['l2tps']['log'] = "diag_logs_vpn.php?vpntype=l2tp"; +$shortcuts['l2tps']['log'] = "status_logs_vpn.php?vpntype=l2tp"; $shortcuts['carp'] = array(); $shortcuts['carp']['main'] = "system_hasync.php"; diff --git a/src/usr/local/www/carp_status.php b/src/usr/local/www/status_carp.php index 5d9fdbf..b6a3d93 100644 --- a/src/usr/local/www/carp_status.php +++ b/src/usr/local/www/status_carp.php @@ -1,6 +1,6 @@ <?php /* - carp_status.php + status_carp.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -57,7 +57,7 @@ ##|*IDENT=page-status-carp ##|*NAME=Status: CARP ##|*DESCR=Allow access to the 'Status: CARP' page. -##|*MATCH=carp_status.php* +##|*MATCH=status_carp.php* ##|-PRIV /* @@ -180,7 +180,7 @@ if ($carpcount == 0) { } else { ?> -<form action="carp_status.php" method="post"> +<form action="status_carp.php" method="post"> <?php if($status > 0) $carp_enabled = true; @@ -193,7 +193,7 @@ if ($carpcount == 0) { gettext("CARP has detected a problem and this unit has been demoted to BACKUP status.") . "<br/>" . gettext("Check the link status on all interfaces with configured CARP VIPs.") . "<br/>" . gettext("Search the") . - " <a href=\"/diag_logs.php?filtertext=carp%3A+demoted+by\">" . + " <a href=\"/status_logs.php?filtertext=carp%3A+demoted+by\">" . gettext("system log") . "</a> " . gettext("for CARP demotion-related events.") . "<br/><br/>" . diff --git a/src/usr/local/www/diag_ipsec.php b/src/usr/local/www/status_ipsec.php index d42afbc..c78d3fb 100644 --- a/src/usr/local/www/diag_ipsec.php +++ b/src/usr/local/www/status_ipsec.php @@ -1,6 +1,6 @@ <?php /* - diag_ipsec.php + status_ipsec.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -65,7 +65,7 @@ ##|*IDENT=page-status-ipsec ##|*NAME=Status: IPsec ##|*DESCR=Allow access to the 'Status: IPsec' page. -##|*MATCH=diag_ipsec.php* +##|*MATCH=status_ipsec.php* ##|-PRIV @@ -120,10 +120,10 @@ $a_phase1 = &$config['ipsec']['phase1']; $status = ipsec_list_sa(); $tab_array = array(); -$tab_array[] = array(gettext("Overview"), true, "diag_ipsec.php"); -$tab_array[] = array(gettext("Leases"), false, "diag_ipsec_leases.php"); -$tab_array[] = array(gettext("SAD"), false, "diag_ipsec_sad.php"); -$tab_array[] = array(gettext("SPD"), false, "diag_ipsec_spd.php"); +$tab_array[] = array(gettext("Overview"), true, "status_ipsec.php"); +$tab_array[] = array(gettext("Leases"), false, "status_ipsec_leases.php"); +$tab_array[] = array(gettext("SAD"), false, "status_ipsec_sad.php"); +$tab_array[] = array(gettext("SPD"), false, "status_ipsec_spd.php"); display_top_tabs($tab_array); ?> @@ -278,13 +278,13 @@ if (is_array($status)) { <?php if ($ikesa['state'] != 'ESTABLISHED') { ?> - <a href="diag_ipsec.php?act=connect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-success" data-toggle="tooltip" title="Connect VPN" > + <a href="status_ipsec.php?act=connect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-success" data-toggle="tooltip" title="Connect VPN" > <?=gettext("Connect VPN")?> </a> <?php } else { ?> - <a href="diag_ipsec.php?act=ikedisconnect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-danger" data-toggle="tooltip" title="Disconnect VPN"> + <a href="status_ipsec.php?act=ikedisconnect&ikeid=<?=$con_id; ?>" class="btn btn-xs btn-danger" data-toggle="tooltip" title="Disconnect VPN"> <?=gettext("Disconnect")?> </a><br /> <?php @@ -393,7 +393,7 @@ if (is_array($status)) { ?> </td> <td> - <a href="diag_ipsec.php?act=childdisconnect&ikeid=<?=$con_id; ?>&ikesaid=<?=$childsa['uniqueid']; ?>" class="btn btn-xs btn-warning" data-toggle="tooltip" title="<?=gettext('Disconnect Child SA')?>"> + <a href="status_ipsec.php?act=childdisconnect&ikeid=<?=$con_id; ?>&ikesaid=<?=$childsa['uniqueid']; ?>" class="btn btn-xs btn-warning" data-toggle="tooltip" title="<?=gettext('Disconnect Child SA')?>"> <?=gettext("Disconnect")?> </a> </td> @@ -490,7 +490,7 @@ foreach ($a_phase1 as $ph1ent) { <?=gettext("Disconnected")?> </td> <td > - <a href="diag_ipsec.php?act=connect&ikeid=<?=$ph1ent['ikeid']; ?>" class="btn btn-xs btn-success"> + <a href="status_ipsec.php?act=connect&ikeid=<?=$ph1ent['ikeid']; ?>" class="btn btn-xs btn-success"> <?=gettext("Connect VPN")?> </a> </td> diff --git a/src/usr/local/www/diag_ipsec_leases.php b/src/usr/local/www/status_ipsec_leases.php index 51fcab2..7fee324 100644 --- a/src/usr/local/www/diag_ipsec_leases.php +++ b/src/usr/local/www/status_ipsec_leases.php @@ -1,6 +1,6 @@ <?php /* - diag_ipsec_leases.php + status_ipsec_leases.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -62,7 +62,7 @@ ##|*IDENT=page-status-ipsec-leases ##|*NAME=Status: IPsec: Leases ##|*DESCR=Allow access to the 'Status: IPsec: Leases' page. -##|*MATCH=diag_ipsec_leases.php* +##|*MATCH=status_ipsec_leases.php* ##|-PRIV define(DEBUG, true); // Force dummy data for testing. Setting up a pFSense box to get real data is far too hard! @@ -77,10 +77,10 @@ include("head.inc"); $mobile = ipsec_dump_mobile(); $tab_array = array(); -$tab_array[] = array(gettext("Overview"), false, "diag_ipsec.php"); -$tab_array[] = array(gettext("Leases"), true, "diag_ipsec_leases.php"); -$tab_array[] = array(gettext("SAD"), false, "diag_ipsec_sad.php"); -$tab_array[] = array(gettext("SPD"), false, "diag_ipsec_spd.php"); +$tab_array[] = array(gettext("Overview"), false, "status_ipsec.php"); +$tab_array[] = array(gettext("Leases"), true, "status_ipsec_leases.php"); +$tab_array[] = array(gettext("SAD"), false, "status_ipsec_sad.php"); +$tab_array[] = array(gettext("SPD"), false, "status_ipsec_spd.php"); display_top_tabs($tab_array); if (isset($mobile['pool']) && is_array($mobile['pool'])) { diff --git a/src/usr/local/www/diag_ipsec_sad.php b/src/usr/local/www/status_ipsec_sad.php index 2e785a2..fa2b8d6 100644 --- a/src/usr/local/www/diag_ipsec_sad.php +++ b/src/usr/local/www/status_ipsec_sad.php @@ -1,6 +1,6 @@ <?php /* - diag_ipsec_sad.php + status_ipsec_sad.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -65,7 +65,7 @@ ##|*IDENT=page-status-ipsec-sad ##|*NAME=Status: IPsec: SAD ##|*DESCR=Allow access to the 'Status: IPsec: SAD' page. -##|*MATCH=diag_ipsec_sad.php* +##|*MATCH=status_ipsec_sad.php* ##|-PRIV require("guiconfig.inc"); @@ -88,10 +88,10 @@ if ($_GET['act'] == "del") { } $tab_array = array(); -$tab_array[] = array(gettext("Overview"), false, "diag_ipsec.php"); -$tab_array[] = array(gettext("Leases"), false, "diag_ipsec_leases.php"); -$tab_array[] = array(gettext("SAD"), true, "diag_ipsec_sad.php"); -$tab_array[] = array(gettext("SPD"), false, "diag_ipsec_spd.php"); +$tab_array[] = array(gettext("Overview"), false, "status_ipsec.php"); +$tab_array[] = array(gettext("Leases"), false, "status_ipsec_leases.php"); +$tab_array[] = array(gettext("SAD"), true, "status_ipsec_sad.php"); +$tab_array[] = array(gettext("SPD"), false, "status_ipsec_spd.php"); display_top_tabs($tab_array); if (count($sad)) { @@ -140,7 +140,7 @@ if (count($sad)) { $args .= "&proto=" . rawurlencode($sa['proto']); $args .= "&spi=" . rawurlencode("0x" . $sa['spi']); ?> - <a class="btn btn-xs btn-danger" href="diag_ipsec_sad.php?act=del&<?=$args?>">Delete</a> + <a class="btn btn-xs btn-danger" href="status_ipsec_sad.php?act=del&<?=$args?>">Delete</a> </td> </tr> diff --git a/src/usr/local/www/diag_ipsec_spd.php b/src/usr/local/www/status_ipsec_spd.php index 2e807a6..464408b 100644 --- a/src/usr/local/www/diag_ipsec_spd.php +++ b/src/usr/local/www/status_ipsec_spd.php @@ -1,6 +1,6 @@ <?php /* - diag_ipsec_spd.php + status_ipsec_spd.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -65,7 +65,7 @@ ##|*IDENT=page-status-ipsec-spd ##|*NAME=Status: IPsec: SPD ##|*DESCR=Allow access to the 'Status: IPsec: SPD' page. -##|*MATCH=diag_ipsec_spd.php* +##|*MATCH=status_ipsec_spd.php* ##|-PRIV define(RIGHTARROW, '►'); @@ -81,10 +81,10 @@ include("head.inc"); $spd = ipsec_dump_spd(); $tab_array = array(); -$tab_array[0] = array(gettext("Overview"), false, "diag_ipsec.php"); -$tab_array[1] = array(gettext("Leases"), false, "diag_ipsec_leases.php"); -$tab_array[2] = array(gettext("SAD"), false, "diag_ipsec_sad.php"); -$tab_array[3] = array(gettext("SPD"), true, "diag_ipsec_spd.php"); +$tab_array[0] = array(gettext("Overview"), false, "status_ipsec.php"); +$tab_array[1] = array(gettext("Leases"), false, "status_ipsec_leases.php"); +$tab_array[2] = array(gettext("SAD"), false, "status_ipsec_sad.php"); +$tab_array[3] = array(gettext("SPD"), true, "status_ipsec_spd.php"); display_top_tabs($tab_array); if (count($spd)) { diff --git a/src/usr/local/www/diag_logs.php b/src/usr/local/www/status_logs.php index d3fc1f8..ffd1019 100755 --- a/src/usr/local/www/diag_logs.php +++ b/src/usr/local/www/status_logs.php @@ -1,6 +1,6 @@ <?php /* - diag_logs.php + status_logs.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -64,7 +64,7 @@ ##|*IDENT=page-diagnostics-logs-system ##|*NAME=Status: Logs: System ##|*DESCR=Allow access to the 'Status: System Logs: General' page. -##|*MATCH=diag_logs.php +##|*MATCH=status_logs.php ##|-PRIV require("guiconfig.inc"); @@ -112,6 +112,9 @@ if (!$_GET['logfile']) { } } +$system_logfile = "{$g['varlog_path']}/" . basename($logfile) . ".log"; + + function getGETPOSTsettingvalue($settingname, $default) { $settingvalue = $default; if ($_GET[$settingname]) { @@ -123,9 +126,11 @@ function getGETPOSTsettingvalue($settingname, $default) { return $settingvalue; } + $filtersubmit = getGETPOSTsettingvalue('filtersubmit', null); if ($filtersubmit) { + $filter_active = true; $filtertext = getGETPOSTsettingvalue('filtertext', ""); $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); } @@ -133,6 +138,7 @@ if ($filtersubmit) { $filterlogentries_submit = getGETPOSTsettingvalue('filterlogentries_submit', null); if ($filterlogentries_submit) { + $filter_active = true; $filterfieldsarray = array(); $filterfieldsarray['time'] = getGETPOSTsettingvalue('filterlogentries_time', null); @@ -142,9 +148,111 @@ if ($filterlogentries_submit) { $filterlogentries_qty = getGETPOSTsettingvalue('filterlogentries_qty', null); } -$system_logfile = "{$g['varlog_path']}/" . basename($logfile) . ".log"; -$nentries = $config['syslog']['nentries']; +# Manage Log - Code + +$specific_log = basename($logfile) . '_settings'; + +# All +$pconfig['cronorder'] = $config['syslog'][$specific_log]['cronorder']; +$pconfig['nentries'] = $config['syslog'][$specific_log]['nentries']; +$pconfig['logfilesize'] = $config['syslog'][$specific_log]['logfilesize']; +$pconfig['format'] = $config['syslog'][$specific_log]['format']; + +# System General (main) Specific +$pconfig['loglighttpd'] = !isset($config['syslog']['nologlighttpd']); + +$save_settings = getGETPOSTsettingvalue('save_settings', null); + +if ($save_settings) { + + # All + $cronorder = getGETPOSTsettingvalue('cronorder', null); + $nentries = getGETPOSTsettingvalue('nentries', null); + $logfilesize = getGETPOSTsettingvalue('logfilesize', null); + $format = getGETPOSTsettingvalue('format', null); + + # System General (main) Specific + $loglighttpd = getGETPOSTsettingvalue('loglighttpd', null); + + unset($input_errors); + $pconfig = $_POST; + + /* input validation */ + # All + if (isset($nentries) && (strlen($nentries) > 0)) { + if (!is_numeric($nentries) || ($nentries < 5) || ($nentries > 2000)) { + $input_errors[] = gettext("Number of log entries to show must be between 5 and 2000."); + } + } + + if (isset($logfilesize) && (strlen($logfilesize) > 0)) { + if (!is_numeric($logfilesize) || ($logfilesize < 100000)) { + $input_errors[] = gettext("Log file size must be numeric and greater than or equal to 100000."); + } + } + + if (!$input_errors) { + + # Clear out the specific log settings and leave only the applied settings to override the general logging options (global) settings. + unset($config['syslog'][$specific_log]); + + # All + if ($cronorder != '') { # if not using the general logging options setting (global) + $config['syslog'][$specific_log]['cronorder'] = $cronorder; + } + + if (isset($nentries) && (strlen($nentries) > 0)) { + $config['syslog'][$specific_log]['nentries'] = (int)$nentries; + } + + if (isset($logfilesize) && (strlen($logfilesize) > 0)) { + $config['syslog'][$specific_log]['logfilesize'] = (int)$logfilesize; + } + + if ($format != '') { # if not using the general logging options setting (global) + $config['syslog'][$specific_log]['format'] = $format; + } + + # System General (main) Specific + if ($logfile == 'system') { + $oldnologlighttpd = isset($config['syslog']['nologlighttpd']); + $config['syslog']['nologlighttpd'] = $loglighttpd ? false : true; + } + + + write_config($desc = "Log Display Settings Saved: " . gettext($allowed_logs[$logfile]["name"])); + + $retval = 0; + $savemsg = get_std_save_message($retval); + + # System General (main) Specific + if ($logfile == 'system') { + if ($oldnologlighttpd !== isset($config['syslog']['nologlighttpd'])) { + ob_flush(); + flush(); + log_error(gettext("webConfigurator configuration has changed. Restarting webConfigurator.")); + send_event("service restart webgui"); + $savemsg .= "<br />" . gettext("WebGUI process is restarting."); + } + } + } +} + + +# Formatted/Raw Display +if ($config['syslog'][$specific_log]['format'] == 'formatted') { + $rawfilter = false; +} +else if ($config['syslog'][$specific_log]['format'] == 'raw') { + $rawfilter = true; +} +else { # Use the general logging options setting (global). + $rawfilter = isset($config['syslog']['rawfilter']); +} + + +isset($config['syslog'][$specific_log]['nentries']) ? $nentries = $config['syslog'][$specific_log]['nentries'] : $nentries = $config['syslog']['nentries']; # Override Display Quantity if ($filterlogentries_qty) { @@ -172,34 +280,47 @@ if (!empty($allowed_logs[$logfile]["shortcut"])) { $pgtitle = array(gettext("Status"), gettext("System logs"), gettext($allowed_logs[$logfile]["name"])); include("head.inc"); +if (!$input_errors && $savemsg) { + print_info_box($savemsg); + $manage_log_active = false; +} + $tab_array = array(); -$tab_array[] = array(gettext("System"), ($logfile == 'system'), "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), ($logfile == 'dhcpd'), "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), ($logfile == 'portalauth'), "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), ($logfile == 'ipsec'), "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), ($logfile == 'ppp'), "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), ($logfile == 'relayd'), "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), ($logfile == 'system'), "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), false, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), ($logfile == 'dhcpd'), "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), ($logfile == 'portalauth'), "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), ($logfile == 'ipsec'), "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), ($logfile == 'ppp'), "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), ($logfile == 'relayd'), "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), ($logfile == 'openvpn'), "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), ($logfile == 'ntpd'), "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); if (in_array($logfile, array('system', 'gateways', 'routing', 'resolver', 'wireless'))) { - $tab_array[] = array(gettext("General"), ($logfile == 'system'), "/diag_logs.php"); - $tab_array[] = array(gettext("Gateways"), ($logfile == 'gateways'), "/diag_logs.php?logfile=gateways"); - $tab_array[] = array(gettext("Routing"), ($logfile == 'routing'), "/diag_logs.php?logfile=routing"); - $tab_array[] = array(gettext("Resolver"), ($logfile == 'resolver'), "/diag_logs.php?logfile=resolver"); - $tab_array[] = array(gettext("Wireless"), ($logfile == 'wireless'), "/diag_logs.php?logfile=wireless"); + $tab_array[] = array(gettext("General"), ($logfile == 'system'), "/status_logs.php"); + $tab_array[] = array(gettext("Gateways"), ($logfile == 'gateways'), "/status_logs.php?logfile=gateways"); + $tab_array[] = array(gettext("Routing"), ($logfile == 'routing'), "/status_logs.php?logfile=routing"); + $tab_array[] = array(gettext("Resolver"), ($logfile == 'resolver'), "/status_logs.php?logfile=resolver"); + $tab_array[] = array(gettext("Wireless"), ($logfile == 'wireless'), "/status_logs.php?logfile=wireless"); display_top_tabs($tab_array, false, 'nav nav-tabs'); } -if (!isset($config['syslog']['rawfilter'])) { // Advanced log filter form +define(SEC_OPEN, 0x00); +define(SEC_CLOSED, 0x04); + +if ($filter_active) + $filter_state = SEC_OPEN; +else + $filter_state = SEC_CLOSED; + +if (!$rawfilter) { // Advanced log filter form $form = new Form(false); - $section = new Form_Section(gettext('Advanced Log Filter'), 'adv-filter-panel', true); + $section = new Form_Section('Advanced Log Filter', 'adv-filter-panel', COLLAPSIBLE|$filter_state); $group = new Form_Group(''); @@ -208,21 +329,21 @@ if (!isset($config['syslog']['rawfilter'])) { // Advanced log filter form null, 'text', $filterfieldsarray['time'] - ))->setHelp(gettext('Time')); + ))->setWidth(3)->setHelp('Time'); $group->add(new Form_Input( 'filterlogentries_process', null, 'text', $filterfieldsarray['process'] - ))->setHelp(gettext('Process')); + ))->setWidth(2)->setHelp('Process'); $group->add(new Form_Input( 'filterlogentries_pid', null, 'text', $filterfieldsarray['pid'] - ))->setHelp(gettext('PID')); + ))->setWidth(2)->setHelp('PID'); $group->add(new Form_Input( 'filterlogentries_qty', @@ -230,7 +351,7 @@ if (!isset($config['syslog']['rawfilter'])) { // Advanced log filter form 'number', $filterlogentries_qty, ['placeholder' => $nentries] - ))->setHelp(gettext('Quantity')); + ))->setWidth(2)->setHelp('Quantity'); $section->add($group); @@ -241,7 +362,7 @@ if (!isset($config['syslog']['rawfilter'])) { // Advanced log filter form null, 'text', $filterfieldsarray['message'] - ))->setHelp(gettext('Log Message')); + ))->setWidth(7)->setHelp('Message'); $btnsubmit = new Form_Button( 'filterlogentries_submit', @@ -253,7 +374,7 @@ if (!isset($config['syslog']['rawfilter'])) { // Advanced log filter form else { // Simple log filter form $form = new Form(false); - $section = new Form_Section(gettext('Log Filter'), 'basic-filter-panel', true); + $section = new Form_Section('Log Filter', 'basic-filter-panel', COLLAPSIBLE|$filter_state); $group = new Form_Group(''); @@ -262,7 +383,7 @@ else { // Simple log filter form null, 'text', $filtertext - ))->setHelp(gettext('Filter Expression')); + ))->setWidth(6)->setHelp('Filter Expression'); $group->add(new Form_Input( 'filterlogentries_qty', @@ -270,7 +391,7 @@ else { // Simple log filter form 'number', $filterlogentries_qty, ['placeholder' => $nentries] - ))->setHelp(gettext('Quantity')); + ))->setWidth(2)->setHelp('Quantity'); $btnsubmit = new Form_Button( 'filtersubmit', @@ -293,7 +414,7 @@ $form->add($section); print $form; // Now the forms are complete we can draw the log table and its controls -if (!isset($config['syslog']['rawfilter'])) { +if (!$rawfilter) { if ($filterlogentries_submit) $filterlog = conv_log_filter($system_logfile, $nentries, $nentries + 100, $filterfieldsarray); else @@ -305,11 +426,11 @@ if (!isset($config['syslog']['rawfilter'])) { <h2 class="panel-title"> <?php if ((!$filtertext) && (!$filterfieldsarray)) - printf(gettext("Last %d %s log entries."), count($filterlog), $logfile); + printf(gettext("Last %d %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); else - printf(gettext("%d matched %s log entries."), count($filterlog), $logfile); + printf(gettext("%d matched %s log entries."), count($filterlog), gettext($allowed_logs[$logfile]["name"])); - printf(gettext(" (Maximum %d)"), $nentries); + printf(" (" . gettext("Maximum %d") . ")", $nentries); ?> </h2> </div> @@ -320,7 +441,7 @@ if (!isset($config['syslog']['rawfilter'])) { <th><?=gettext("Time")?></th> <th><?=gettext("Process")?></th> <th><?=gettext("PID")?></th> - <th style="width:100%"><?=gettext("Log Message")?></th> + <th style="width:100%"><?=gettext("Message")?></th> </tr> <?php foreach ($filterlog as $filterent) { @@ -343,24 +464,26 @@ if (!isset($config['syslog']['rawfilter'])) { } // e-o-foreach ?> </table> +<?php + if (count($filterlog) == 0) + print_info_box(gettext('No logs to display')); +?> </div> </div> </div> <?php - if (count($filterlog) == 0) - print_info_box(gettext('No logs to display')); } else { ?> <div class="panel panel-default"> - <div class="panel-heading"><h2 class="panel-title"><?=gettext("Last ")?><?=$nentries?> <?=$logfile?><?=gettext(" log entries")?></h2></div> + <div class="panel-heading"><h2 class="panel-title"><?=gettext("Last ")?><?=$nentries?> <?=gettext($allowed_logs[$logfile]["name"])?><?=gettext(" log entries")?></h2></div> <div class="table table-responsive"> <table class="table table-striped table-hover"> <thead> <tr> - <th class="col-sm-2"></th> - <th></th> + <th><?=gettext("Time")?></th> + <th style="width:100%"><?=gettext("Message")?></th> </tr> </thead> <tbody> @@ -377,20 +500,154 @@ else ?> </tbody> </table> - </div> -</div> <?php if ($rows == 0) print_info_box(gettext('No logs to display')); +?> + </div> +</div> +<?php } ?> <?php +# Manage Log - Section/Form + +if ($input_errors) { + print_input_errors($input_errors); + $manage_log_active = true; +} + +if ($manage_log_active) + $manage_log_state = SEC_OPEN; +else + $manage_log_state = SEC_CLOSED; + $form = new Form(false); -$section = new Form_Section(gettext('Manage Log'), 'log-manager-panel', true); +$section = new Form_Section(gettext('Manage') . ' ' . gettext($allowed_logs[$logfile]["name"]) . ' ' . gettext('Log'), 'log-manager-panel', COLLAPSIBLE|$manage_log_state); + +$section->addInput(new Form_StaticText( + '', + 'These settings override the "General Logging Options" settings.' +)); + + +# All +$group = new Form_Group('Forward/Reverse Display'); + +$group->add(new Form_Checkbox( + 'cronorder', + null, + 'Forward', + ($pconfig['cronorder'] == 'forward') ? true : false, + 'forward' +))->displayAsRadio(); + +$group->add(new Form_Checkbox( + 'cronorder', + null, + 'Reverse', + ($pconfig['cronorder'] == 'reverse') ? true : false, + 'reverse' +))->displayAsRadio(); + +$group->add(new Form_Checkbox( + 'cronorder', + null, + 'General Logging Options Setting', + ($pconfig['cronorder'] == '') ? true : false, + '' +))->displayAsRadio(); + +$group->setHelp('Show log entries in forward (newest at bottom) or reverse (newest at top) order.'); +$section->add($group); + +$group = new Form_Group('GUI Log Entries'); + +# Use the general logging options setting (global) as placeholder. +$group->add(new Form_Input( + 'nentries', + 'GUI Log Entries', + 'number', + $pconfig['nentries'], + ['placeholder' => $config['syslog']['nentries']] +))->setWidth(2); + +$group->setHelp('This is the number of log entries displayed in the GUI. It does not affect how many entries are contained in the log.'); +$section->add($group); + +$group = new Form_Group('Log file size (Bytes)'); + +# Use the general logging options setting (global) as placeholder. +$group->add(new Form_Input( + 'logfilesize', + 'Log file size (Bytes)', + 'number', + $pconfig['logfilesize'], + ['placeholder' => $config['syslog']['logfilesize'] ? $config['syslog']['logfilesize'] : "511488"] +))->setWidth(2); +$group->setHelp("The log is held in a constant-size circular log file. This field controls how large the log file is, and thus how many entries may exist inside the log. The default is approximately 500KB." . + '<br /><br />' . + "NOTE: The log size is changed the next time it is cleared. To immediately change the log size, first save the options to set the size, then clear the log using the \"Clear Log\" action below. "); +$section->add($group); + +$group = new Form_Group('Formatted/Raw Display'); + +$group->add(new Form_Checkbox( + 'format', + null, + 'Formatted', + ($pconfig['format'] == 'formatted') ? true : false, + 'formatted' +))->displayAsRadio(); + +$group->add(new Form_Checkbox( + 'format', + null, + 'Raw', + ($pconfig['format'] == 'raw') ? true : false, + 'raw' +))->displayAsRadio(); + +$group->add(new Form_Checkbox( + 'format', + null, + 'General Logging Options Setting', + ($pconfig['format'] == '') ? true : false, + '' +))->displayAsRadio(); + +$group->setHelp('Show the log entries as formatted or raw output as generated by the service. The raw output will reveal more detailed information, but it is more difficult to read.'); +$section->add($group); + + +# System General (main) Specific +if ($logfile == 'system') { + $section->addInput(new Form_Checkbox( + 'loglighttpd', + 'Web Server Log', + 'Log errors from the web server process', + $pconfig['loglighttpd'] + ))->setHelp('If this is checked, errors from the lighttpd web server process for the GUI or Captive Portal will appear in the system log.'); +} + + +$group = new Form_Group('Action'); + +$btnsavesettings = new Form_Button( + 'save_settings', + gettext('Save'), + null +); + +$btnsavesettings->addClass('btn-sm'); + +$group->add(new Form_StaticText( + '', + $btnsavesettings +))->setHelp('Saves changed settings.'); -$group = new Form_Group(''); $btnclear = new Form_Button( 'clear', @@ -401,13 +658,10 @@ $btnclear = new Form_Button( $btnclear->removeClass('btn-primary')->addClass('btn-danger')->addClass('btn-sm'); -if ($logfile == 'dhcpd') - print_info_box(gettext('Warning: Clearing the log file will restart the DHCP daemon.')); - $group->add(new Form_StaticText( '', $btnclear -)); +))->setHelp('Clears local log file and reinitializes it as an empty log. Save any settings changes first.'); $section->add($group); $form->add($section); diff --git a/src/usr/local/www/diag_logs_filter.php b/src/usr/local/www/status_logs_filter.php index baf279e..6ccd914 100644 --- a/src/usr/local/www/diag_logs_filter.php +++ b/src/usr/local/www/status_logs_filter.php @@ -1,6 +1,6 @@ <?php /* - diag_logs_filter.php + status_logs_filter.php */ /* ==================================================================== @@ -65,7 +65,7 @@ ##|*IDENT=page-diagnostics-logs-firewall ##|*NAME=Status: Logs: Firewall ##|*DESCR=Allow access to the 'Status: Logs: Firewall' page. -##|*MATCH=diag_logs_filter.php* +##|*MATCH=status_logs_filter.php* ##|-PRIV require("guiconfig.inc"); @@ -181,23 +181,23 @@ function build_if_list() { } $tab_array = array(); -$tab_array[] = array(gettext("System"), false, "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), false, "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), false, "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), false, "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), false, "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), false, "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), true, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), false, "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); -$tab_array[] = array(gettext("Normal View"), true, "/diag_logs_filter.php"); -$tab_array[] = array(gettext("Dynamic View"), false, "/diag_logs_filter_dynamic.php"); -$tab_array[] = array(gettext("Summary View"), false, "/diag_logs_filter_summary.php"); +$tab_array[] = array(gettext("Normal View"), true, "/status_logs_filter.php"); +$tab_array[] = array(gettext("Dynamic View"), false, "/status_logs_filter_dynamic.php"); +$tab_array[] = array(gettext("Summary View"), false, "/status_logs_filter_summary.php"); display_top_tabs($tab_array, false, 'nav nav-tabs'); $Include_Act = explode(",", str_replace(" ", ",", $filterfieldsarray['act'])); @@ -371,7 +371,7 @@ if (!isset($config['syslog']['rawfilter'])) { $filterlog = conv_log_filter($filter_logfile, $nentries, $nentries + 100, $filtertext, $interfacefilter); ?> -<form id="clearform" name="clearform" action="diag_logs_filter.php" method="post" style="margin-top: 14px;"> +<form id="clearform" name="clearform" action="status_logs_filter.php" method="post" style="margin-top: 14px;"> <input id="submit" name="clear" type="submit" class="btn btn-danger" value="<?=gettext("Clear log")?>" /> </form> @@ -419,12 +419,12 @@ if (!isset($config['syslog']['rawfilter'])) { <td> <?php if ($filterent['act'] == "block") { - $icon_act = "fa-times icon-danger"; + $icon_act = "fa-times text-danger"; } else { - $icon_act = "fa-check icon-success"; + $icon_act = "fa-check text-success"; } ?> - <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> + <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> <?php if ($filterent['count']) echo $filterent['count']; @@ -559,7 +559,7 @@ function outputrule(req) { } function resolve_with_ajax(ip_to_resolve) { - var url = "/diag_logs_filter.php"; + var url = "/status_logs_filter.php"; $.ajax( url, diff --git a/src/usr/local/www/diag_logs_filter_dynamic.php b/src/usr/local/www/status_logs_filter_dynamic.php index b6e03bb..63771f5 100755 --- a/src/usr/local/www/diag_logs_filter_dynamic.php +++ b/src/usr/local/www/status_logs_filter_dynamic.php @@ -1,6 +1,6 @@ <?php /* - diag_logs_filter_dynamic.php + status_logs_filter_dynamic.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -64,7 +64,7 @@ ##|*IDENT=page-diagnostics-logs-firewall-dynamic ##|*NAME=Status: System Logs: Firewall (Dynamic View) ##|*DESCR=Allow access to the 'Status: System Logs: Firewall (Dynamic View)' page -##|*MATCH=diag_logs_filter_dynamic.php* +##|*MATCH=status_logs_filter_dynamic.php* ##|-PRIV require("guiconfig.inc"); @@ -185,7 +185,7 @@ function fetch_new_rules() { if(isBusy) return; isBusy = true; - getURL('diag_logs_filter_dynamic.php?lastsawtime=' + lastsawtime, fetch_new_rules_callback); + getURL('status_logs_filter_dynamic.php?lastsawtime=' + lastsawtime, fetch_new_rules_callback); } function fetch_new_rules_callback(callback_data) { @@ -325,23 +325,23 @@ function toggleListDescriptions(){ <?php $tab_array = array(); -$tab_array[] = array(gettext("System"), false, "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), false, "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), false, "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), false, "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), false, "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), false, "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), true, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), false, "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); -$tab_array[] = array(gettext("Normal View"), false, "/diag_logs_filter.php"); -$tab_array[] = array(gettext("Dynamic View"), true, "/diag_logs_filter_dynamic.php"); -$tab_array[] = array(gettext("Summary View"), false, "/diag_logs_filter_summary.php"); +$tab_array[] = array(gettext("Normal View"), false, "/status_logs_filter.php"); +$tab_array[] = array(gettext("Dynamic View"), true, "/status_logs_filter_dynamic.php"); +$tab_array[] = array(gettext("Summary View"), false, "/status_logs_filter_summary.php"); display_top_tabs($tab_array, false, 'nav nav-tabs'); ?> @@ -394,12 +394,12 @@ display_top_tabs($tab_array, false, 'nav nav-tabs'); <td> <?php if ($filterent['act'] == "block") { - $icon_act = "fa-times icon-danger"; + $icon_act = "fa-times text-danger"; } else { - $icon_act = "fa-check icon-success"; + $icon_act = "fa-check text-success"; } ?> - <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> + <i class="fa <?php echo $icon_act;?> icon-pointer" title="<?php echo $filterent['act'] .'/'. $filterent['tracker'];?>" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?="{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);"></i> </td> <td><?=htmlspecialchars($filterent['time'])?></td> <td><?=htmlspecialchars($filterent['interface'])?></td> diff --git a/src/usr/local/www/diag_logs_filter_summary.php b/src/usr/local/www/status_logs_filter_summary.php index d55261e..a460577 100644 --- a/src/usr/local/www/diag_logs_filter_summary.php +++ b/src/usr/local/www/status_logs_filter_summary.php @@ -1,6 +1,6 @@ <?php /* - diag_logs_filter_summary.php + status_logs_filter_summary.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -62,7 +62,7 @@ ##|*IDENT=page-diagnostics-logs-firewall-summary ##|*NAME=Status: System Logs: Firewall Log Summary ##|*DESCR=Allow access to the 'Status: System Logs: Firewall Log Summary' page -##|*MATCH=diag_logs_filter_summary.php* +##|*MATCH=status_logs_filter_summary.php* ##|-PRIV require_once("guiconfig.inc"); @@ -277,23 +277,23 @@ $shortcut_section = "firewall"; include("head.inc"); $tab_array = array(); -$tab_array[] = array(gettext("System"), false, "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), true, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), false, "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), false, "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), false, "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), false, "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), false, "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), true, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), false, "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); -$tab_array[] = array(gettext("Normal View"), false, "/diag_logs_filter.php"); -$tab_array[] = array(gettext("Dynamic View"), false, "/diag_logs_filter_dynamic.php"); -$tab_array[] = array(gettext("Summary View"), true, "/diag_logs_filter_summary.php"); +$tab_array[] = array(gettext("Normal View"), false, "/status_logs_filter.php"); +$tab_array[] = array(gettext("Dynamic View"), false, "/status_logs_filter_dynamic.php"); +$tab_array[] = array(gettext("Summary View"), true, "/status_logs_filter_summary.php"); display_top_tabs($tab_array, false, 'nav nav-tabs'); print("<br />"); diff --git a/src/usr/local/www/diag_logs_settings.php b/src/usr/local/www/status_logs_settings.php index 0f56b44..0152471 100644 --- a/src/usr/local/www/diag_logs_settings.php +++ b/src/usr/local/www/status_logs_settings.php @@ -1,6 +1,6 @@ <?php /* - diag_logs_settings.php + status_logs_settings.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -64,7 +64,7 @@ ##|*IDENT=page-diagnostics-logs-settings ##|*NAME=Status: Logs: Settings ##|*DESCR=Allow access to the 'Status: Logs: Settings' page. -##|*MATCH=diag_logs_settings.php* +##|*MATCH=status_logs_settings.php* ##|-PRIV require("guiconfig.inc"); @@ -230,17 +230,17 @@ else if ($savemsg) print_info_box($savemsg); $tab_array = array(); -$tab_array[] = array(gettext("System"), false, "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), false, "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), false, "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), false, "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), false, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), false, "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), true, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), false, "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), false, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), false, "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), false, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), true, "status_logs_settings.php"); display_top_tabs($tab_array); $form = new Form(new Form_Button( diff --git a/src/usr/local/www/diag_logs_vpn.php b/src/usr/local/www/status_logs_vpn.php index d14a8a5..403daee 100755..100644 --- a/src/usr/local/www/diag_logs_vpn.php +++ b/src/usr/local/www/status_logs_vpn.php @@ -1,7 +1,7 @@ #!/usr/local/bin/php <?php /* - diag_logs_vpn.php + status_logs_vpn.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -66,7 +66,7 @@ ##|*IDENT=page-diagnostics-logs-pptpvpn ##|*NAME=Status: Logs: VPN ##|*DESCR=Allow access to the 'Status: Logs: VPN' page. -##|*MATCH=diag_logs_vpn.php* +##|*MATCH=status_logs_vpn.php* ##|-PRIV @@ -152,32 +152,32 @@ function dump_clog_vpn($logfile, $tail) { include("head.inc"); $tab_array = array(); -$tab_array[] = array(gettext("System"), false, "diag_logs.php"); -$tab_array[] = array(gettext("Firewall"), false, "diag_logs_filter.php"); -$tab_array[] = array(gettext("DHCP"), false, "diag_logs.php?logfile=dhcpd"); -$tab_array[] = array(gettext("Portal Auth"), false, "diag_logs.php?logfile=portalauth"); -$tab_array[] = array(gettext("IPsec"), false, "diag_logs.php?logfile=ipsec"); -$tab_array[] = array(gettext("PPP"), false, "diag_logs.php?logfile=ppp"); -$tab_array[] = array(gettext("VPN"), true, "diag_logs_vpn.php"); -$tab_array[] = array(gettext("Load Balancer"), false, "diag_logs.php?logfile=relayd"); -$tab_array[] = array(gettext("OpenVPN"), false, "diag_logs.php?logfile=openvpn"); -$tab_array[] = array(gettext("NTP"), false, "diag_logs.php?logfile=ntpd"); -$tab_array[] = array(gettext("Settings"), false, "diag_logs_settings.php"); +$tab_array[] = array(gettext("System"), false, "status_logs.php"); +$tab_array[] = array(gettext("Firewall"), false, "status_logs_filter.php"); +$tab_array[] = array(gettext("DHCP"), false, "status_logs.php?logfile=dhcpd"); +$tab_array[] = array(gettext("Portal Auth"), false, "status_logs.php?logfile=portalauth"); +$tab_array[] = array(gettext("IPsec"), false, "status_logs.php?logfile=ipsec"); +$tab_array[] = array(gettext("PPP"), false, "status_logs.php?logfile=ppp"); +$tab_array[] = array(gettext("VPN"), true, "status_logs_vpn.php"); +$tab_array[] = array(gettext("Load Balancer"), false, "status_logs.php?logfile=relayd"); +$tab_array[] = array(gettext("OpenVPN"), false, "status_logs.php?logfile=openvpn"); +$tab_array[] = array(gettext("NTP"), false, "status_logs.php?logfile=ntpd"); +$tab_array[] = array(gettext("Settings"), false, "status_logs_settings.php"); display_top_tabs($tab_array); $tab_array = array(); $tab_array[] = array(gettext("PPPoE Logins"), (($vpntype == "poes") && ($mode != "raw")), - "/diag_logs_vpn.php?vpntype=poes"); + "/status_logs_vpn.php?vpntype=poes"); $tab_array[] = array(gettext("PPPoE Raw"), (($vpntype == "poes") && ($mode == "raw")), - "/diag_logs_vpn.php?vpntype=poes&mode=raw"); + "/status_logs_vpn.php?vpntype=poes&mode=raw"); $tab_array[] = array(gettext("L2TP Logins"), (($vpntype == "l2tp") && ($mode != "raw")), - "/diag_logs_vpn.php?vpntype=l2tp"); + "/status_logs_vpn.php?vpntype=l2tp"); $tab_array[] = array(gettext("L2TP Raw"), (($vpntype == "l2tp") && ($mode == "raw")), - "/diag_logs_vpn.php?vpntype=l2tp&mode=raw"); + "/status_logs_vpn.php?vpntype=l2tp&mode=raw"); display_top_tabs($tab_array, false, 'nav nav-tabs'); ?> @@ -223,7 +223,7 @@ display_top_tabs($tab_array, false, 'nav nav-tabs'); } ?> <p> - <form action="diag_logs_vpn.php" method="post"> + <form action="status_logs_vpn.php" method="post"> <input type="hidden" name="vpntype" id="vpntype" value="<?=$vpntype?>" /> <input type="hidden" name="mode" id="mode" value="<?=$mode?>" /> <input name="clear" type="submit" class="btn btn-danger" value="<?=gettext("Clear log")?>" /> diff --git a/src/usr/local/www/diag_pkglogs.php b/src/usr/local/www/status_pkglogs.php index f4781f0..23385d2 100755 --- a/src/usr/local/www/diag_pkglogs.php +++ b/src/usr/local/www/status_pkglogs.php @@ -1,6 +1,6 @@ <?php /* - diag_pkglogs.php + status_pkglogs.php */ /* ==================================================================== * Copyright (c) 2004-2015 Electric Sheep Fencing, LLC. All rights reserved. @@ -72,7 +72,7 @@ ##|*IDENT=page-status-packagelogs ##|*NAME=Status: Package logs ##|*DESCR=Allow access to the 'Status: Package logs' page. -##|*MATCH=diag_pkglogs.php* +##|*MATCH=status_pkglogs.php* ##|-PRIV require("guiconfig.inc"); @@ -119,9 +119,9 @@ if ($pkgwithlogging == false) { if ($apkg == $package['name']) { $curtab = $logtab; - $tab_array[] = array(sprintf(gettext("%s"), $logtab), true, "diag_pkglogs.php?pkg=".$package['name']); + $tab_array[] = array(sprintf(gettext("%s"), $logtab), true, "status_pkglogs.php?pkg=".$package['name']); } else { - $tab_array[] = array(sprintf(gettext("%s"), $logtab), false, "diag_pkglogs.php?pkg=".$package['name']); + $tab_array[] = array(sprintf(gettext("%s"), $logtab), false, "status_pkglogs.php?pkg=".$package['name']); } } } diff --git a/src/usr/local/www/system.php b/src/usr/local/www/system.php index 175fd6d..051dcae 100644 --- a/src/usr/local/www/system.php +++ b/src/usr/local/www/system.php @@ -487,14 +487,14 @@ $section->addInput(new Form_Select( 'Theme', $pconfig['webguicss'], $csslist -))->setHelp('<span class="badge" title="This feature is in BETA">BETA</span> Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css'); +))->setHelp('Choose an alternative css file (if installed) to change the appearance of the Web configurator. css files are located in /usr/local/www/bootstrap/css'); $section->addInput(new Form_Select( 'webguifixedmenu', 'Top Navigation', $pconfig['webguifixedmenu'], ["" => "Scrolls with page", "fixed" => "Fixed (Remains visible at top of page)"] -))->setHelp("<span class=\"badge bg-danger\" title=\"This feature is in BETA\">BETA</span>"); +))->setHelp("The fixed option is intended for large screens only."); $section->addInput(new Form_Input( 'dashboardcolumns', diff --git a/src/usr/local/www/vpn_ipsec.php b/src/usr/local/www/vpn_ipsec.php index 6087ec9..9a81ab6 100644 --- a/src/usr/local/www/vpn_ipsec.php +++ b/src/usr/local/www/vpn_ipsec.php @@ -550,7 +550,7 @@ display_top_tabs($tab_array); <div id="infoblock"> <?=print_info_box('<strong>' . gettext("Note:") . '</strong><br />' . - gettext("You can check your IPsec status at ") . '<a href="diag_ipsec.php">' . gettext("Status:IPsec") . '</a>.<br />' . + gettext("You can check your IPsec status at ") . '<a href="status_ipsec.php">' . gettext("Status:IPsec") . '</a>.<br />' . gettext("IPsec Debug Mode can be enabled at ") . '<a href="vpn_ipsec_settings.php">' .gettext("VPN:IPsec:Advanced Settings") . '</a>.<br />' . gettext("IPsec can be set to prefer older SAs at ") . '<a href="vpn_ipsec_settings.php">' . gettext("VPN:IPsec:Advanced Settings") . '</a>', info)?> </div> diff --git a/src/usr/local/www/widgets/include/carp_status.inc b/src/usr/local/www/widgets/include/carp_status.inc index 37334b0..63a49fe 100644 --- a/src/usr/local/www/widgets/include/carp_status.inc +++ b/src/usr/local/www/widgets/include/carp_status.inc @@ -2,6 +2,6 @@ //set variable for custom title $carp_status_title = "CARP Status"; -$carp_status_title_link = "carp_status.php"; +$carp_status_title_link = "status_carp.php"; ?> diff --git a/src/usr/local/www/widgets/include/ipsec.inc b/src/usr/local/www/widgets/include/ipsec.inc index 6df0a7c..59fe454 100644 --- a/src/usr/local/www/widgets/include/ipsec.inc +++ b/src/usr/local/www/widgets/include/ipsec.inc @@ -1,4 +1,4 @@ <?php $ipsec_title = "IPsec"; -$ipsec_title_link = "diag_ipsec.php"; +$ipsec_title_link = "status_ipsec.php"; ?> diff --git a/src/usr/local/www/widgets/include/log.inc b/src/usr/local/www/widgets/include/log.inc index 7ad453a..d2bafb0 100644 --- a/src/usr/local/www/widgets/include/log.inc +++ b/src/usr/local/www/widgets/include/log.inc @@ -1,6 +1,6 @@ <?php //set variable for custom title $log_title = "Firewall Logs"; -$log_title_link = "diag_logs_filter.php"; +$log_title_link = "status_logs_filter.php"; ?>
\ No newline at end of file diff --git a/src/usr/local/www/widgets/widgets/carp_status.widget.php b/src/usr/local/www/widgets/widgets/carp_status.widget.php index e5c2e0e..8884e2b 100644 --- a/src/usr/local/www/widgets/widgets/carp_status.widget.php +++ b/src/usr/local/www/widgets/widgets/carp_status.widget.php @@ -114,7 +114,7 @@ $carp_enabled = get_carp_status(); } } else { ?> - <tr><td>No CARP Interfaces Defined. Click <a href="carp_status.php">here</a> to configure CARP.</td></tr> + <tr><td>No CARP Interfaces Defined. Click <a href="status_carp.php">here</a> to configure CARP.</td></tr> <?php } ?> diff --git a/src/usr/local/www/widgets/widgets/log.widget.php b/src/usr/local/www/widgets/widgets/log.widget.php index a9d9a27..1d5874f 100644 --- a/src/usr/local/www/widgets/widgets/log.widget.php +++ b/src/usr/local/www/widgets/widgets/log.widget.php @@ -150,13 +150,13 @@ if (isset($_POST['lastsawtime'])) { } if ($filterent['act'] == "block") { - $iconfn = "times icon-danger"; + $iconfn = "times text-danger"; } else if ($filterent['act'] == "reject") { - $iconfn = "hand-stop-o icon-warning"; + $iconfn = "hand-stop-o text-warning"; } else if ($filterent['act'] == "match") { $iconfn = "filter"; } else { - $iconfn = "check icon-success"; + $iconfn = "check text-success"; } $rule = find_rule_by_number($filterent['rulenum'], $filterent['tracker'], $filterent['act']); @@ -166,7 +166,7 @@ if (isset($_POST['lastsawtime'])) { $dstIP = str_replace(':', ':<wbr>', $dstIP); ?> <tr> - <td><a href="#" onclick="javascript:getURL('diag_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);" + <td><a href="#" onclick="javascript:getURL('status_logs_filter.php?getrulenum=<?php echo "{$filterent['rulenum']},{$filterent['tracker']},{$filterent['act']}"; ?>', outputrule);" role="button" data-toggle="popover" data-trigger="hover" data-title="Rule that triggered this action" data-content="<?=htmlspecialchars($rule)?>"> <i |
