diff --git a/src/www/status.php b/src/www/status.php index 0a0f70a09..6ca84b13d 100755 --- a/src/www/status.php +++ b/src/www/status.php @@ -29,7 +29,7 @@ POSSIBILITY OF SUCH DAMAGE. */ /* - pfSense_BUILDER_BINARIES: /usr/bin/vmstat /usr/bin/netstat /sbin/dmesg /sbin/mount /sbin/setkey /usr/local/sbin/pftop + pfSense_BUILDER_BINARIES: /usr/bin/vmstat /usr/bin/netstat /sbin/dmesg /sbin/mount /sbin/setkey /usr/local/sbin/pftop pfSense_BUILDER_BINARIES: /sbin/pfctl /sbin/sysctl /usr/bin/top /usr/bin/netstat /sbin/pfctl /sbin/ifconfig pfSense_MODULE: support */ @@ -190,7 +190,7 @@ if(isset($config['system']['usefifolog'])) { defCmdT("last 200 system log entries","/usr/local/sbin/clog /var/log/system.log 2>&1 | tail -n 200"); defCmdT("last 50 filter log entries","/usr/local/sbin/clog /var/log/filter.log 2>&1 | tail -n 50"); } - + defCmd("ls /conf"); defCmd("ls /var/run"); diff --git a/src/www/status_captiveportal.php b/src/www/status_captiveportal.php index b15db4bcf..7e101b33a 100644 --- a/src/www/status_captiveportal.php +++ b/src/www/status_captiveportal.php @@ -1,22 +1,22 @@ -. 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 @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: captiveportal */ @@ -69,7 +69,7 @@ include("head.inc"); ?> - + listClients(array(),"and",array($order) ) ; - + } else { $cpdb = array() ; } - + // Load MAC-Manufacturer table $mac_man = load_mac_manufacturer_table(); @@ -109,15 +109,15 @@ $mac_man = load_mac_manufacturer_table();
-
+
- - - + + +
- + - + ?> - -
- -
+ +
+ +
- +
- ip, $cpent->mac); + //$last_act = captiveportal_get_last_activity($cpent->ip, $cpent->mac); $last_act=0; ?> @@ -205,10 +205,10 @@ $mac_man = load_mac_manufacturer_table();
+


@@ -192,7 +192,7 @@ $mac_man = load_mac_manufacturer_table(); username);?>  allow_time));?>
- +
- -
+ +
@@ -223,12 +223,12 @@ $mac_man = load_mac_manufacturer_table();
-
+
- - \ No newline at end of file + + diff --git a/src/www/status_captiveportal_expire.php b/src/www/status_captiveportal_expire.php index 06e9eeef6..a3e55ae71 100644 --- a/src/www/status_captiveportal_expire.php +++ b/src/www/status_captiveportal_expire.php @@ -66,11 +66,11 @@ include("head.inc");
-
-
- +
+
+
- + - -
- -
+ +
+ +
- -
- - + +
+
+
@@ -105,7 +105,7 @@ include("head.inc");
- + -
+
-
+
@@ -133,4 +133,4 @@ if ($_POST) {
- \ No newline at end of file + diff --git a/src/www/status_captiveportal_test.php b/src/www/status_captiveportal_test.php index bcda9569b..21e914610 100644 --- a/src/www/status_captiveportal_test.php +++ b/src/www/status_captiveportal_test.php @@ -2,17 +2,17 @@ /* Copyright (C) 2007 Marcel Wiget . 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 @@ -24,7 +24,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: captiveportal */ @@ -67,12 +67,12 @@ include("head.inc");
-
-
- +
+
+
- - - -
- -
+ ?> + +
+ +
- -
- + +
+
- + . +

- .
  @@ -105,7 +105,7 @@ include("head.inc");
- +
-
+
-
+
- - \ No newline at end of file + + diff --git a/src/www/status_captiveportal_voucher_rolls.php b/src/www/status_captiveportal_voucher_rolls.php index cc60c903c..be9a904fc 100644 --- a/src/www/status_captiveportal_voucher_rolls.php +++ b/src/www/status_captiveportal_voucher_rolls.php @@ -71,11 +71,11 @@ include("head.inc");
-
-
- +
+
+
- + - -
- -
+ +
+ +
- -
- + +
+
@@ -137,13 +137,13 @@ include("head.inc");
-
+
-
+
- \ No newline at end of file + diff --git a/src/www/status_captiveportal_vouchers.php b/src/www/status_captiveportal_vouchers.php index 444a74797..21098b644 100644 --- a/src/www/status_captiveportal_vouchers.php +++ b/src/www/status_captiveportal_vouchers.php @@ -105,11 +105,11 @@ include("head.inc");
-
-
- +
+
+
- + - -
- -
+ +
+ +
- -
- + +
+
@@ -147,13 +147,13 @@ include("head.inc");
-
+
-
+
- \ No newline at end of file + diff --git a/src/www/status_dashboard.php b/src/www/status_dashboard.php index a1d7a8ecc..5a447be11 100644 --- a/src/www/status_dashboard.php +++ b/src/www/status_dashboard.php @@ -1 +1 @@ - \ No newline at end of file + diff --git a/src/www/status_dhcp_leases.php b/src/www/status_dhcp_leases.php index 80a66ab84..039767ff9 100644 --- a/src/www/status_dhcp_leases.php +++ b/src/www/status_dhcp_leases.php @@ -92,9 +92,9 @@ include("head.inc");
-
+
- + 0) { } foreach($config['interfaces'] as $ifname => $ifarr) { - if (is_array($config['dhcpd'][$ifname]) && + if (is_array($config['dhcpd'][$ifname]) && is_array($config['dhcpd'][$ifname]['staticmap'])) { foreach($config['dhcpd'][$ifname]['staticmap'] as $static) { $slease = array(); @@ -301,7 +301,7 @@ if ($_GET['order']) if(count($pools) > 0) { ?>
-
+
@@ -323,7 +323,7 @@ if(count($pools) > 0) { echo "\n"; echo "\n"; } - + ?>
 
@@ -336,10 +336,10 @@ if(count($pools) > 0) { ?>
-
+
- + @@ -379,27 +379,27 @@ if(count($pools) > 0) { foreach ($config['dhcpd'] as $dhcpif => $dhcpifconf) { if (!is_array($dhcpifconf['range'])) continue; - if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) { - $data['if'] = $dhcpif; - break; - } + if (($lip >= ip2ulong($dhcpifconf['range']['from'])) && ($lip <= ip2ulong($dhcpifconf['range']['to']))) { + $data['if'] = $dhcpif; + break; + } } - } + } echo "\n"; echo "\n"; - $mac=$data['mac']; + $mac=$data['mac']; $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); if ($data['online'] != "online") { if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined echo "\n"; - }else{ - echo "\n"; + }else{ + echo "\n"; } }else{ if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined echo "\n"; }else{ - echo "\n"; + echo "\n"; } } echo "\n"; @@ -419,10 +419,10 @@ if(count($pools) > 0) { } else { echo "\"add\" \n"; } - + echo ""; echo "\"add\" \n"; - + /* Only show the button for offline dynamic leases */ if (($data['type'] == "dynamic") && ($data['online'] != "online")) { echo ""; @@ -431,14 +431,14 @@ if(count($pools) > 0) { echo "\n"; } } - + ?>
{$fspans}{$data['ip']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}{$data['mac']}{$fspane}{$fspans}{$mac}
{$mac_man[$mac_hi]}{$fspane}		{$fspans}{$data['mac']}{$fspane}{$fspans}{$data['mac']}{$fspane}{$fspans}" . htmlentities($data['hostname']) . "{$fspane}
- - + +
@@ -460,4 +460,4 @@ if(count($pools) > 0) {
- \ No newline at end of file + diff --git a/src/www/status_dhcpv6_leases.php b/src/www/status_dhcpv6_leases.php index 237a7f0ac..3043e21e4 100644 --- a/src/www/status_dhcpv6_leases.php +++ b/src/www/status_dhcpv6_leases.php @@ -98,7 +98,7 @@ include("head.inc");
-
+
@@ -391,7 +391,7 @@ if(count($pools) > 0) { ?>
-
+
@@ -413,7 +413,7 @@ if(count($pools) > 0) { echo "\n"; echo "\n"; } - + ?>
 
@@ -426,10 +426,10 @@ if(count($pools) > 0) { ?>
-
+
- + @@ -449,7 +449,7 @@ if(count($pools) > 0) { $fspans = ""; $fspane = " "; } - + if ($data['act'] == "static") { foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { if(is_array($dhcpifconf['staticmap'])) { @@ -475,14 +475,14 @@ if(count($pools) > 0) { if (!empty($data['hostname'])) { echo htmlentities($data['hostname']) . "
"; } - + $mac=trim($ndpdata[$data['ip']]['mac']); if (!empty($mac)) { $mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]); print htmlentities($mac); if(isset($mac_man[$mac_hi])){ print "
{$mac_man[$mac_hi]}"; } } - + echo "{$fspane} \n"; if ($data['type'] != "static") { echo "\n"; @@ -493,7 +493,7 @@ if(count($pools) > 0) { } echo "\n"; echo "\n"; - + if ($data['type'] == "dynamic") { echo "\n"; @@ -501,7 +501,7 @@ if(count($pools) > 0) { echo "\n"; } - + /* Only show the button for offline dynamic leases */ if (($data['type'] == "dynamic") && ($data['online'] != "online")) { echo "
{$fspans}" . adjust_gmt($data['start']) . "{$fspane}{$fspans}{$data['online']}{$fspane}{$fspans}{$data['act']}{$fspane}"; echo "\"add\""; echo "\"add\""; @@ -511,19 +511,19 @@ if(count($pools) > 0) { } } ?> -
+
- - + +
- +
-

Delegated Prefixes

-
- +

Delegated Prefixes

+ +
@@ -544,7 +544,7 @@ if(count($pools) > 0) { $fspans = ""; $fspane = " "; } - + if ($data['act'] == "static") { foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) { if(is_array($dhcpifconf['staticmap'])) { @@ -581,11 +581,11 @@ if(count($pools) > 0) { } } ?> -
+
- +
@@ -607,4 +607,4 @@ if(count($pools) > 0) {
- \ No newline at end of file + diff --git a/src/www/status_filter_reload.php b/src/www/status_filter_reload.php index 599fe1cf7..e93e6ab84 100644 --- a/src/www/status_filter_reload.php +++ b/src/www/status_filter_reload.php @@ -26,7 +26,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: filter */ @@ -70,16 +70,16 @@ include("head.inc");
-
+
- + - +
- +
-
-
+
+
@@ -88,16 +88,16 @@ include("head.inc");


- +
- +
- +
- +
.
diff --git a/src/www/status_gateway_groups.php b/src/www/status_gateway_groups.php index 731e192fc..3ad1841e1 100755 --- a/src/www/status_gateway_groups.php +++ b/src/www/status_gateway_groups.php @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: routing */ @@ -58,46 +58,46 @@ include("head.inc"); - +
-
+
- + - +
- - - -
- + +
+
- - + + - + - - - + + + "; ?>
- + @@ -110,13 +110,13 @@ include("head.inc"); } $priority_count = count($priorities); ksort($priorities); - + echo ""; foreach($priorities as $number => $tier) { echo ""; } echo "\n"; - + /* inverse gateway group to gateway priority */ $priority_arr = array(); foreach($gateway_group['item'] as $item) { @@ -136,18 +136,18 @@ include("head.inc"); if($p == $c) { $status = $gateways_status[$monitor]['status']; if (stristr($status, "down")) { - $online = gettext("Offline"); - $bgcolor = "#F08080"; // lightcoral - } elseif (stristr($status, "loss")) { - $online = gettext("Warning, Packetloss"); - $bgcolor = "#F0E68C"; // khaki - } elseif (stristr($status, "delay")) { - $online = gettext("Warning, Latency"); - $bgcolor = "#F0E68C"; // khaki - } elseif ($status == "none") { - $online = gettext("Online"); - $bgcolor = "#90EE90"; // lightgreen - } else { + $online = gettext("Offline"); + $bgcolor = "#F08080"; // lightcoral + } elseif (stristr($status, "loss")) { + $online = gettext("Warning, Packetloss"); + $bgcolor = "#F0E68C"; // khaki + } elseif (stristr($status, "delay")) { + $online = gettext("Warning, Latency"); + $bgcolor = "#F0E68C"; // khaki + } elseif ($status == "none") { + $online = gettext("Online"); + $bgcolor = "#90EE90"; // lightgreen + } else { $online = gettext("Gathering data"); $bgcolor = "#ADD8E6"; // lightblue } @@ -169,7 +169,7 @@ include("head.inc"); - +
" . sprintf(gettext("Tier %s"), $number) . "
diff --git a/src/www/status_gateways.php b/src/www/status_gateways.php index b074e6940..49e3f9339 100644 --- a/src/www/status_gateways.php +++ b/src/www/status_gateways.php @@ -28,7 +28,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: routing */ @@ -56,41 +56,41 @@ include("head.inc"); - +
-
+
- + - +
- - - -
+ +
- - + + - - - - - - - - - - - - + + + + + + + + + + + + $gateway) { ?> @@ -101,7 +101,7 @@ include("head.inc");
-
- + diff --git a/src/www/status_graph.php b/src/www/status_graph.php index 11082323f..8a3b7023f 100644 --- a/src/www/status_graph.php +++ b/src/www/status_graph.php @@ -31,7 +31,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: routing */ @@ -190,7 +190,7 @@ function updateBandwidthHosts(data){ } } } - + setTimeout('updateBandwidth()', 1000); } //]]> @@ -199,36 +199,36 @@ function updateBandwidthHosts(data){
-
+
- + - +
- +
- +
- - - - - - - - - - - + + + + + + + + + + - - - - - + +
Sort byFilterDisplay
Sort byFilterDisplay
- +
- +
- +
- - + +
@@ -380,4 +380,4 @@ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enabl jQuery(document).ready(updateBandwidth); //]]> - \ No newline at end of file + diff --git a/src/www/status_graph_cpu.php b/src/www/status_graph_cpu.php index 4e218146a..e3b8f1ad3 100644 --- a/src/www/status_graph_cpu.php +++ b/src/www/status_graph_cpu.php @@ -1,21 +1,21 @@ -. 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 @@ -27,7 +27,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: system */ diff --git a/src/www/status_interfaces.php b/src/www/status_interfaces.php index cf8d18d8a..972493a43 100644 --- a/src/www/status_interfaces.php +++ b/src/www/status_interfaces.php @@ -31,7 +31,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: interfaces */ @@ -51,7 +51,7 @@ if ($_POST['if'] && $_POST['submit']) { if ($_POST['status'] == "up") interface_bring_down($interface); else - interface_configure($interface); + interface_configure($interface); header("Location: status_interfaces.php"); exit; } @@ -67,416 +67,416 @@ include("head.inc");
- +
- +
-
- +
+
- + - $ifname): $ifinfo = get_interface_info($ifdescr); // Load MAC-Manufacturer table $mac_man = load_mac_manufacturer_table(); ?> - + - - - + + + - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - - - - - - - - - + + + + + + + + + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - - - - + + + + - +
- (, ) -
+ (, ) +
- -
- DHCP - -
- - -    - - -
-
- DHCP6 - -
- - -    - - -
-
-
- - -    - - -
-
-
- - -    - - -
-
-
- - -    - - -
-
-
- - - - - " /> - - - " /> - - -
-
- -
- -
- -
- -
- -
- kbit/s -
- kbit/s -
- kbit/s -
- kbit/s -
- " . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print ""; } - else {print htmlspecialchars($mac);} - ?> -
- -   -
- -
- - -
- -   -
- -   -
- -
- - -
- "; - } - ?> -
- -
- -
- -
- -
+ +
+ DHCP + +
+ + +    + + +
+
+ DHCP6 + +
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + +    + + +
+
+
+ + + + + " /> + + + " /> + + +
+
+ +
+ +
+ +
+ +
+ +
+ kbit/s +
+ kbit/s +
+ kbit/s +
+ kbit/s +
+ " . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print ""; } + else {print htmlspecialchars($mac);} + ?> +
+ +   +
+ +
+ + +
+ +   +
+ +   +
+ +
+ + +
+ "; + } + ?> +
+ +
+ +
+ +
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
+ +
- -
- -
- -
+ +
+ +
+ +
- -
+ +
- -
+ +
- -
+ +
- "; - echo $interrupt_sec . " " . gettext("rate"); - ?> -
+ "; + echo $interrupt_sec . " " . gettext("rate"); + ?> +
- +

- +
- \ No newline at end of file + diff --git a/src/www/status_lb_pool.php b/src/www/status_lb_pool.php index 37274e9c4..673cd3b67 100644 --- a/src/www/status_lb_pool.php +++ b/src/www/status_lb_pool.php @@ -112,31 +112,31 @@ if ($_POST) {
-
+
- +
"));?> - +
- - - -
- + +
+
- + - - + + @@ -145,10 +145,10 @@ if ($_POST) { - + - +
@@ -185,7 +185,7 @@ if ($_POST) { $pool_hosts[]=$svr; } asort($pool_hosts); - + foreach ((array) $pool_hosts as $server) { if($server['ip']['addr']!="") { switch ($server['ip']['state']) { @@ -230,17 +230,17 @@ if ($_POST) {
-
+
" /> " /> - +
-
+
- \ No newline at end of file + diff --git a/src/www/status_lb_vs.php b/src/www/status_lb_vs.php index fa051d734..1c5c633cd 100644 --- a/src/www/status_lb_vs.php +++ b/src/www/status_lb_vs.php @@ -63,28 +63,28 @@ include("head.inc");
-
+
- +
"));?> - +
- - - -
-
+ +
+
- + @@ -154,12 +154,12 @@ include("head.inc");
-
-
+
+
- \ No newline at end of file + diff --git a/src/www/status_ntpd.php b/src/www/status_ntpd.php index 85d93edc5..f5dcadb5a 100644 --- a/src/www/status_ntpd.php +++ b/src/www/status_ntpd.php @@ -166,22 +166,22 @@ include("head.inc"); - +
- +
- +

Network Time Protocol Status

- +
-
- - +
+
+ @@ -264,10 +264,10 @@ include("head.inc"); ' . $gps_alt . ' ' . $gps_alt_unit . '';}?> @@ -277,7 +277,7 @@ include("head.inc");
(° ) -
-
+
diff --git a/src/www/status_openvpn.php b/src/www/status_openvpn.php index 68d8a25e9..b549731ad 100644 --- a/src/www/status_openvpn.php +++ b/src/www/status_openvpn.php @@ -143,25 +143,25 @@ include("head.inc"); ?> //]]> - +
- +
- +

Network Time Protocol Status

- +
- - + + -
+
- + "> - + @@ -230,7 +230,7 @@ include("head.inc"); ?>
" /> - - +
@@ -179,7 +179,7 @@ include("head.inc"); ?>
@@ -207,7 +207,7 @@ include("head.inc"); ?> title="" alt="delete" />
@@ -247,7 +247,7 @@ include("head.inc"); ?> - + "> - + @@ -275,11 +275,11 @@ include("head.inc"); ?> - + - - + + @@ -300,7 +300,7 @@ include("head.inc"); ?> - + ">
@@ -339,10 +339,10 @@ include("head.inc"); ?>
- + - + @@ -363,7 +363,7 @@ include("head.inc"); ?> - + ">
@@ -403,19 +403,19 @@ include("head.inc"); ?>
- - " . gettext("NOTE") . ": " . gettext("If you have custom options that override the management features of OpenVPN on a client or server, they will cause that OpenVPN instance to not work correctly with this status page."); } - + if ((empty($clients)) && (empty($servers)) && (empty($sk_servers))) { echo gettext("No OpenVPN instance defined"); } ?> - +
@@ -424,7 +424,7 @@ include("head.inc"); ?>
- + + - \ No newline at end of file + diff --git a/src/www/status_queues.php b/src/www/status_queues.php index ea0d553e3..27510141b 100644 --- a/src/www/status_queues.php +++ b/src/www/status_queues.php @@ -29,7 +29,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_BUILDER_BINARIES: /sbin/pfctl pfSense_MODULE: shaper */ @@ -50,7 +50,7 @@ header("Pragma: no-cache"); // HTTP/1.0 require("guiconfig.inc"); class QueueStats { public $queuename; - public $queuelength; + public $queuelength; public $pps; public $bandwidth; public $borrows; @@ -58,7 +58,7 @@ class QueueStats { public $drops; } if (!file_exists("{$g['varrun_path']}/qstats.pid") || !isvalidpid("{$g['varrun_path']}/qstats.pid")) { - /* Start in the background so we don't hang up the GUI */ + /* Start in the background so we don't hang up the GUI */ mwexec_bg("/usr/local/sbin/qstats -p {$g['varrun_path']}/qstats.pid"); /* Give it a moment to start up */ sleep(1); @@ -76,7 +76,7 @@ $fd = @fsockopen("unix://{$g['varrun_path']}/qstats"); if ($altqstats == -1) $error = "No queue statistics could be read."; } -if ($_REQUEST['getactivity']) { +if ($_REQUEST['getactivity']) { $statistics = array(); $bigger_stat = 0; $stat_type = $_REQUEST['stats']; @@ -98,7 +98,7 @@ if ($_REQUEST['getactivity']) { if ($bigger_stat < $q->bandwidth) $bigger_stat = $q->bandwidth; } - } + } $finscript = ""; foreach($statistics as $q) { if ($stat_type == "0") @@ -130,22 +130,22 @@ include("head.inc");
- +
- +
- +

- +

- +
- +
-
- - +
+
+ - + - - +
@@ -187,15 +187,15 @@ include("head.inc");
-
- +
+

:
.
@@ -203,7 +203,7 @@ include("head.inc");

- +
@@ -225,7 +225,7 @@ include("head.inc"); -"; echo ""; echo ""; - echo ""; + echo ""; ?> queuename = $xml['name'] . $xml['interface']; - $current->queuelength = $xml['qlength']; + $current->queuelength = $xml['qlength']; $current->pps = $xml['measured']; $current->bandwidth = $xml['measuredspeedint']; $current->borrows = intval($xml['borrows']); diff --git a/src/www/status_rrd_graph.php b/src/www/status_rrd_graph.php index 82de240ad..b88ea564e 100644 --- a/src/www/status_rrd_graph.php +++ b/src/www/status_rrd_graph.php @@ -27,7 +27,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_MODULE: system */ @@ -191,8 +191,8 @@ $styles = array('inverse' => gettext('Inverse'), $curstyle = "inverse"; if ($_GET['style']) { - foreach($styles as $style) - if(strtoupper($style) == strtoupper($_GET['style'])) + foreach($styles as $style) + if(strtoupper($style) == strtoupper($_GET['style'])) $curstyle = $_GET['style']; } else { if(! empty($config['rrd']['style'])) { @@ -403,34 +403,34 @@ function get_dates($curperiod, $graph) {
-
+
- + - +
- - - -
- - - - + + + +
+ + + + - - - + + +
" />

- +
- + @@ -528,7 +528,7 @@ function get_dates($curperiod, $graph) { } ?> - +
-
- +
+ - +
- + diff --git a/src/www/status_rrd_graph_img.php b/src/www/status_rrd_graph_img.php index 868e3a13f..57e83cb24 100644 --- a/src/www/status_rrd_graph_img.php +++ b/src/www/status_rrd_graph_img.php @@ -27,7 +27,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_BUILDER_BINARIES: /bin/rm /usr/local/bin/rrdtool pfSense_MODULE: system */ @@ -553,11 +553,11 @@ elseif(strstr($curdatabase, "-throughput.rrd")) { $g++; } $graphcmd .= "CDEF:\"tput-in_bits_pass={$graphtputbip}{$operand}\" "; - $graphcmd .= "CDEF:\"tput-out_bits_pass={$graphtputbop}{$operand}\" "; + $graphcmd .= "CDEF:\"tput-out_bits_pass={$graphtputbop}{$operand}\" "; $graphcmd .= "CDEF:\"tput-bits_io_pass={$graphtputbtp}{$operand}\" "; $graphcmd .= "CDEF:\"tput-in_bits_block={$graphtputbib}{$operand}\" "; - $graphcmd .= "CDEF:\"tput-out_bits_block={$graphtputbob}{$operand}\" "; + $graphcmd .= "CDEF:\"tput-out_bits_block={$graphtputbob}{$operand}\" "; $graphcmd .= "CDEF:\"tput-bits_io_block={$graphtputbtb}{$operand}\" "; $graphcmd .= "CDEF:\"tput-out_bits_pass_neg=tput-out_bits_pass,$multiplier,*\" "; @@ -995,7 +995,7 @@ elseif((strstr($curdatabase, "-queues.rrd")) && (file_exists("$rrddbpath$curdata $graphcmd .= "--height 200 --width 620 "; if ($altq) { $a_queues =& $altq->get_queue_list(); - $t = 0; + $t = 0; } else { $a_queues = array(); $i = 0; @@ -1026,7 +1026,7 @@ elseif((strstr($curdatabase, "-queuedrops.rrd")) && (file_exists("$rrddbpath$cur $a_queues =& $altq->get_queue_list(); $t = 0; } else { - $a_queues = array(); + $a_queues = array(); $i = 0; $t = 0; } @@ -1066,7 +1066,7 @@ elseif((strstr($curdatabase, "-quality.rrd")) && (file_exists("$rrddbpath$curdat AREA:delay#$colorqualityrtt[0]:\"> 420 ms\" \\ GPRINT:delay:MIN:\"\t\tMin\\: %7.2lf ms\" \\ GPRINT:loss:MIN:\"\tMin\\: %3.1lf %%\\n\" \\ - AREA:r3#$colorqualityrtt[1]:\"180-420 ms\" \\ + AREA:r3#$colorqualityrtt[1]:\"180-420 ms\" \\ GPRINT:delay:AVERAGE:\"\t\tAvg\\: %7.2lf ms\" \\ GPRINT:loss:AVERAGE:\"\tAvg\\: %3.1lf %%\\n\" \\ AREA:r2#$colorqualityrtt[2]:\"60-180 ms\" \\ @@ -1154,7 +1154,7 @@ elseif((strstr($curdatabase, "-loggedin.rrd")) && (file_exists("$rrddbpath$curda $graphcmd .= "AREA:\"$curif-totalusers_d#{$colorcaptiveportalusers[0]}:Total logged in users\" "; $graphcmd .= "GPRINT:\"$curif-totalusers_d:MAX:%8.0lf \\n\" "; $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" "; + $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" "; } elseif((strstr($curdatabase, "-concurrent.rrd")) && (file_exists("$rrddbpath$curdatabase"))) { /* define graphcmd for online Captive Portal users stats */ @@ -1176,7 +1176,7 @@ elseif((strstr($curdatabase, "-concurrent.rrd")) && (file_exists("$rrddbpath$cur $graphcmd .= "GPRINT:\"$curif-concurrentusers:AVERAGE:%8.0lf \" "; $graphcmd .= "GPRINT:\"$curif-concurrentusers:MAX:%8.0lf \" "; $graphcmd .= "COMMENT:\"\\n\" "; - $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" "; + $graphcmd .= "COMMENT:\"\t\t\t\t\t\t\t\t\t\t\t\t\t" . strftime('%b %d %H\:%M\:%S %Y') . "\" "; } elseif((strstr($curdatabase, "ntpd.rrd")) && (file_exists("$rrddbpath$curdatabase"))) { /* define graphcmd for ntpd (was: mbuf) usage stats */ @@ -1225,7 +1225,7 @@ elseif((strstr($curdatabase, "ntpd.rrd")) && (file_exists("$rrddbpath$curdatabas else { $data = false; log_error(sprintf(gettext("Sorry we do not have data to graph for %s"),$curdatabase)); -} +} /* check modification time to see if we need to generate image */ if (file_exists("$rrdtmppath$curdatabase-$curgraph.png")) { @@ -1235,7 +1235,7 @@ if (file_exists("$rrdtmppath$curdatabase-$curgraph.png")) { $graphcmdoutput = implode(" ", $graphcmdoutput) . $graphcmd; flush(); usleep(500); - } + } } else { if($data) $_gb = exec("$graphcmd 2>&1", $graphcmdoutput, $graphcmdreturn); diff --git a/src/www/status_rrd_graph_settings.php b/src/www/status_rrd_graph_settings.php index 6c8ae8bb0..8d8e13810 100644 --- a/src/www/status_rrd_graph_settings.php +++ b/src/www/status_rrd_graph_settings.php @@ -27,7 +27,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_BUILDER_BINARIES: /usr/bin/find pfSense_MODULE: system */ @@ -126,25 +126,25 @@ include("head.inc");
-
+
- + - +
- - - -
- + + + +
+ - - + +
-
@@ -441,7 +441,7 @@ function get_dates($curperiod, $graph) {
+
- + - +
@@ -155,7 +155,7 @@ include("head.inc");
-
+


- +

-
+
- - \ No newline at end of file + + diff --git a/src/www/status_rrd_graph_tabs.php b/src/www/status_rrd_graph_tabs.php index a06615a25..a6599825f 100644 --- a/src/www/status_rrd_graph_tabs.php +++ b/src/www/status_rrd_graph_tabs.php @@ -39,4 +39,4 @@ if($curcat == "settings") { $tabactive = True; } else { $tabactive = False; } $tab_array[] = array(gettext("Settings"), $tabactive, "status_rrd_graph_settings.php"); display_top_tabs($tab_array); -?> \ No newline at end of file +?> diff --git a/src/www/status_services.php b/src/www/status_services.php index 90820232b..31f2081f6 100755 --- a/src/www/status_services.php +++ b/src/www/status_services.php @@ -25,7 +25,7 @@ ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. */ -/* +/* pfSense_BUILDER_BINARIES: /usr/local/sbin/openvpn /usr/bin/killall /bin/ps pfSense_MODULE: services */ @@ -75,16 +75,16 @@ include("fbegin.inc"); ?>
-
+
- + - +
- +
- +
@@ -96,9 +96,9 @@ include("fbegin.inc"); 0) { uasort($services, "service_name_compare"); foreach($services as $service) { @@ -127,7 +127,7 @@ include("fbegin.inc"); } else { echo "\n"; } - + ?>
" . gettext("No services found") . " .
@@ -138,5 +138,5 @@ include("fbegin.inc");
- - \ No newline at end of file + + diff --git a/src/www/status_upnp.php b/src/www/status_upnp.php index 4df9083c5..94e4abffa 100644 --- a/src/www/status_upnp.php +++ b/src/www/status_upnp.php @@ -62,28 +62,28 @@ include("head.inc"); - +
- -
- - - - -
-
- - -
-

-
- - +
+ + + + +
+
+ + +
+

+
+ + +
- - + +
@@ -119,16 +119,16 @@ include("head.inc");
- + " /> . - - - + + +
- - \ No newline at end of file + + diff --git a/src/www/status_wireless.php b/src/www/status_wireless.php index d00cf22fb..d1d4a4e16 100644 --- a/src/www/status_wireless.php +++ b/src/www/status_wireless.php @@ -65,8 +65,8 @@ if(empty($if)) {
- -
+ +
- -
- + +
+
- - -
- + + +
+

-
- -
- + + +
+
@@ -117,7 +117,7 @@ if(empty($if)) { exec("/sbin/ifconfig {$rwlif} list scan 2>&1", $states, $ret); /* Skip Header */ array_shift($states); - + $counter=0; foreach($states as $state) { /* Split by Mac address for the SSID Field */ @@ -132,7 +132,7 @@ if(empty($if)) { $rssi = $split[3]; $int = $split[4]; $caps = "$split[5] $split[6] $split[7] $split[8] $split[9] $split[10] $split[11] "; - + print ""; print ""; print ""; @@ -146,8 +146,8 @@ if(empty($if)) { ?>
SSID
{$ssid}{$bssid}
-
-
+
+

@@ -165,12 +165,12 @@ if(empty($if)) { - + &1", $states, $ret); array_shift($states); - + $counter=0; foreach($states as $state) { $split = preg_split("/[ ]+/i", $state); @@ -188,23 +188,23 @@ if(empty($if)) { print ""; print "\n"; } - + /* XXX: what stats to we get for adhoc mode? */ - + ?>
{$split[9]}
-
- - Flags: A = authorized, E = Extended Rate (802.11g), P = Power save mode
+
+ + Flags: A = authorized, E = Extended Rate (802.11g), P = Power save mode
Capabilities: E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES), S = Short preamble, s = Short slot time
-
+
- - \ No newline at end of file + +