lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 09:04:39 +00:00
Code Issues Packages Projects Releases Wiki Activity

status: apply whitespace cleanups

Browse Source
This commit is contained in:
Franco Fichtner 2014-12-28 13:35:46 +01:00
parent cc6530f6f0
commit 720ed0476c
27 changed files with 851 additions and 851 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/www/status.php
View File

@ -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");

64
src/www/status_captiveportal.php
View File

@ -1,22 +1,22 @@
<?php
<?php
/* $Id$ */
/*
status_captiveportal.php
part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@ -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");
?>
<?php
flush();
@ -82,20 +82,20 @@ function clientcmp($a, $b) {
if (!empty($cpzone)) {
$cpdb_handle = new OPNsense\CaptivePortal\DB($cpzone);
$order = "";
$order = "";
if ($_GET['order']) {
if ($_GET['order'] == "ip") $order = "ip";
else if ($_GET['order'] == "mac") $order = "mac";
else if ($_GET['order'] == "user") $order = "username";
}
$cpdb = $cpdb_handle->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();
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php if (!empty($cpzone) && isset($config['voucher'][$cpzone]['enable'])): ?>
<?php
<?php
$tab_array = array();
$tab_array[] = array(gettext("Active Users"), true, "status_captiveportal.php?zone={$cpzone}");
$tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php?zone={$cpzone}");
@ -125,19 +125,19 @@ $mac_man = load_mac_manufacturer_table();
$tab_array[] = array(gettext("Test Vouchers"), false, "status_captiveportal_test.php?zone={$cpzone}");
$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
display_top_tabs($tab_array);
?>
?>
<?php endif; ?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="<?=$_SERVER['REQUEST_URI'];?>" method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td width="20%" class="vncell" valign="top">
<td width="20%" class="vncell" valign="top">
<br /><?=gettext("Captive Portal Zone"); ?><br/><br />
</td>
<td class="vncell" width="30%" align="center">
@ -192,7 +192,7 @@ $mac_man = load_mac_manufacturer_table();
<td class="listr"><?=htmlspecialchars($cpent->username);?>&nbsp;</td>
<td class="listr"><?=htmlspecialchars(date("m/d/Y H:i:s", $cpent->allow_time));?></td>
<?php if ($_GET['showact']):
//$last_act = captiveportal_get_last_activity($cpent->ip, $cpent->mac);
//$last_act = captiveportal_get_last_activity($cpent->ip, $cpent->mac);
$last_act=0;
?>
<td class="listr"><?php if ($last_act != 0) echo htmlspecialchars(date("m/d/Y H:i:s", $last_act));?></td>
@ -205,10 +205,10 @@ $mac_man = load_mac_manufacturer_table();
</tr>
<?php endforeach; endif; ?>
</table>
</div>
</form>
</form>
<form action="status_captiveportal.php" method="get" style="margin: 14px;">
<input type="hidden" name="order" value="<?=htmlspecialchars($_GET['order']);?>" />
<?php if (!empty($cpzone)): ?>
@ -223,12 +223,12 @@ $mac_man = load_mac_manufacturer_table();
<?php endif; ?>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

32
src/www/status_captiveportal_expire.php
View File

@ -66,11 +66,11 @@ include("head.inc");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("Active Users"), false, "status_captiveportal.php?zone={$cpzone}");
@ -80,16 +80,16 @@ include("head.inc");
$tab_array[] = array(gettext("Expire Vouchers"), true, "status_captiveportal_expire.php?zone={$cpzone}");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="status_captiveportal_expire.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td valign="top" class="vncellreq"><?=gettext("Voucher(s)"); ?></td>
<td class="vtable">
@ -105,7 +105,7 @@ include("head.inc");
</td>
</tr>
</table>
<?php
if ($_POST) {
if ($_POST['vouchers']) {
@ -123,9 +123,9 @@ if ($_POST) {
}
?>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
@ -133,4 +133,4 @@ if ($_POST) {
</section>
<? include("fend.inc"); ?>
<? include("fend.inc"); ?>

50
src/www/status_captiveportal_test.php
View File

@ -2,17 +2,17 @@
/*
Copyright (C) 2007 Marcel Wiget <mwiget@mac.com>.
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");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
<?php
$tab_array = array();
$tab_array[] = array(gettext("Active Users"), false, "status_captiveportal.php?zone={$cpzone}");
$tab_array[] = array(gettext("Active Vouchers"), false, "status_captiveportal_vouchers.php?zone={$cpzone}");
@ -80,23 +80,23 @@ include("head.inc");
$tab_array[] = array(gettext("Test Vouchers"), true, "status_captiveportal_test.php?zone={$cpzone}");
$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="status_captiveportal_test.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td valign="top" class="vncellreq"><?=gettext("Voucher(s)"); ?></td>
<td class="vtable">
<textarea name="vouchers" cols="65" rows="3" id="vouchers" class="formpre"><?=htmlspecialchars($_POST['vouchers']);?></textarea>
<br />
<?=gettext("Enter multiple vouchers separated by space or newline. The remaining time, if valid, will be shown for each voucher"); ?>.</td>
</tr>
<?=gettext("Enter multiple vouchers separated by space or newline. The remaining time, if valid, will be shown for each voucher"); ?>.</td>
</tr>
<tr>
<td width="22%" valign="top">&nbsp;</td>
<td width="78%">
@ -105,7 +105,7 @@ include("head.inc");
</td>
</tr>
</table>
<br/>
<?php
if ($_POST) {
@ -125,15 +125,15 @@ if ($_POST) {
}
}
?>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<? include("foot.inc"); ?>
<? include("foot.inc"); ?>

28
src/www/status_captiveportal_voucher_rolls.php
View File

@ -71,11 +71,11 @@ include("head.inc");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("Active Users"), false, "status_captiveportal.php?zone={$cpzone}");
@ -85,15 +85,15 @@ include("head.inc");
$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="status_captiveportal_voucher_rolls.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td class="listhdrr"><?=gettext("Roll#"); ?></td>
<td class="listhdrr"><?=gettext("Minutes/Ticket"); ?></td>
@ -137,13 +137,13 @@ include("head.inc");
</tr>
<?php $i++; endforeach; unlock($voucherlck); ?>
</table>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

28
src/www/status_captiveportal_vouchers.php
View File

@ -105,11 +105,11 @@ include("head.inc");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<?php
$tab_array = array();
$tab_array[] = array(gettext("Active Users"), false, "status_captiveportal.php?zone={$cpzone}");
@ -119,15 +119,15 @@ include("head.inc");
$tab_array[] = array(gettext("Expire Vouchers"), false, "status_captiveportal_expire.php?zone={$cpzone}");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="status_captiveportal_vouchers.php" method="post" enctype="multipart/form-data" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped table-sort">
<div class="table-responsive">
<table class="table table-striped table-sort">
<tr>
<td class="listhdrr"><a href="?order=0&amp;showact=<?=htmlspecialchars($_GET['showact']);?>"><?=gettext("Voucher"); ?></a></td>
<td class="listhdrr"><a href="?order=1&amp;showact=<?=htmlspecialchars($_GET['showact']);?>"><?=gettext("Roll"); ?></a></td>
@ -147,13 +147,13 @@ include("head.inc");
</tr>
<?php endforeach; ?>
</table>
</div>
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

2
src/www/status_dashboard.php
View File

@ -1 +1 @@
<? include("index.php"); ?>
<? include("index.php"); ?>

48
src/www/status_dhcp_leases.php
View File

@ -92,9 +92,9 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php
@ -103,11 +103,11 @@ function leasecmp($a, $b) {
}
function adjust_gmt($dt) {
global $config;
global $config;
$dhcpd = $config['dhcpd'];
foreach ($dhcpd as $dhcpditem) {
$dhcpleaseinlocaltime = $dhcpditem['dhcpleaseinlocaltime'];
if ($dhcpleaseinlocaltime == "yes")
if ($dhcpleaseinlocaltime == "yes")
break;
}
if ($dhcpleaseinlocaltime == "yes") {
@ -277,7 +277,7 @@ if(count($pools) > 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) {
?>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
@ -323,7 +323,7 @@ if(count($pools) > 0) {
echo "<td class=\"list\" valign=\"middle\" width=\"17\">&nbsp;</td>\n";
echo "</tr>\n";
}
?>
</table>
</div>
@ -336,10 +336,10 @@ if(count($pools) > 0) {
?>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
<tr>
<td class="listhdrr"><?=gettext("IP address"); ?></td>
<td class="listhdrr"><?=gettext("MAC address"); ?></td>
<td class="listhdrr"><?=gettext("Hostname"); ?></td>
@ -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 "<tr>\n";
echo "<td class=\"listlr\">{$fspans}{$data['ip']}{$fspane}</td>\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 "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&amp;mac=$mac\" title=\"" . gettext("$mac - send Wake on LAN packet to this MAC address") ."\">{$mac}</a><br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}</td>\n";
}else{
echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&amp;mac={$data['mac']}\" title=\"" . gettext("send Wake on LAN packet to this MAC address") ."\">{$data['mac']}</a>{$fspane}</td>\n";
}else{
echo "<td class=\"listr\">{$fspans}<a href=\"services_wol.php?if={$data['if']}&amp;mac={$data['mac']}\" title=\"" . gettext("send Wake on LAN packet to this MAC address") ."\">{$data['mac']}</a>{$fspane}</td>\n";
}
}else{
if(isset($mac_man[$mac_hi])){ // Manufacturer for this MAC is defined
echo "<td class=\"listr\">{$fspans}{$mac}<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>{$fspane}</td>\n";
}else{
echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}</td>\n";
echo "<td class=\"listr\">{$fspans}{$data['mac']}{$fspane}</td>\n";
}
}
echo "<td class=\"listr\">{$fspans}" . htmlentities($data['hostname']) . "{$fspane}</td>\n";
@ -419,10 +419,10 @@ if(count($pools) > 0) {
} else {
echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus_mo.gif\" width=\"17\" height=\"17\" border=\"0\" alt=\"add\" />&nbsp;\n";
}
echo "<a href=\"services_wol_edit.php?if={$data['if']}&amp;mac={$data['mac']}&amp;descr={$data['hostname']}\">";
echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_wol_all.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"" . gettext("add a Wake on LAN mapping for this MAC address") ."\" alt=\"add\" /></a>&nbsp;\n";
/* Only show the button for offline dynamic leases */
if (($data['type'] == "dynamic") && ($data['online'] != "online")) {
echo "<a href=\"status_dhcp_leases.php?deleteip={$data['ip']}&amp;all=" . htmlspecialchars($_GET['all']) . "\">";
@ -431,14 +431,14 @@ if(count($pools) > 0) {
echo "</td></tr>\n";
}
}
?>
</table>
</div>
</div>
</section>
<section class="col-xs-12">
<form action="status_dhcp_leases.php" method="get">
@ -460,4 +460,4 @@ if(count($pools) > 0) {
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

42
src/www/status_dhcpv6_leases.php
View File

@ -98,7 +98,7 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
@ -391,7 +391,7 @@ if(count($pools) > 0) {
?>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
@ -413,7 +413,7 @@ if(count($pools) > 0) {
echo "<td class=\"list\" valign=\"middle\" width=\"17\">&nbsp;</td>\n";
echo "</tr>\n";
}
?>
</table>
</div>
@ -426,10 +426,10 @@ if(count($pools) > 0) {
?>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
<tr>
<td class="listhdrr"><?=gettext("IPv6 address"); ?></td>
<td class="listhdrr"><?=gettext("IAID"); ?></td>
<td class="listhdrr"><?=gettext("DUID"); ?></td>
@ -449,7 +449,7 @@ if(count($pools) > 0) {
$fspans = "";
$fspane = "&nbsp;";
}
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']) . "<br />";
}
$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 "<br /><font size=\"-2\"><i>{$mac_man[$mac_hi]}</i></font>"; }
}
echo "{$fspane}&nbsp;</td>\n";
if ($data['type'] != "static") {
echo "<td class=\"listr\">{$fspans}" . adjust_gmt($data['start']) . "{$fspane}</td>\n";
@ -493,7 +493,7 @@ if(count($pools) > 0) {
}
echo "<td class=\"listr\">{$fspans}{$data['online']}{$fspane}</td>\n";
echo "<td class=\"listr\">{$fspans}{$data['act']}{$fspane}</td>\n";
if ($data['type'] == "dynamic") {
echo "<td valign=\"middle\"><a href=\"services_dhcpv6_edit.php?if={$data['if']}&amp;duid={$data['duid']}&amp;hostname={$data['hostname']}\">";
echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus.gif\" width=\"17\" height=\"17\" border=\"0\" title=\"" . gettext("add a static mapping for this MAC address") ."\" alt=\"add\" /></a></td>\n";
@ -501,7 +501,7 @@ if(count($pools) > 0) {
echo "<td class=\"list\" valign=\"middle\">";
echo "<img src=\"/themes/{$g['theme']}/images/icons/icon_plus_mo.gif\" width=\"17\" height=\"17\" border=\"0\" alt=\"add\" /></td>\n";
}
/* Only show the button for offline dynamic leases */
if (($data['type'] == "dynamic") && ($data['online'] != "online")) {
echo "<td class=\"list\" valign=\"middle\"><a href=\"status_dhcpv6_leases.php?deleteip={$data['ip']}&amp;all=" . htmlspecialchars($_GET['all']) . "\">";
@ -511,19 +511,19 @@ if(count($pools) > 0) {
}
}
?>
</table>
</table>
</div>
</div>
</section>
<section class="col-xs-12">
<div class="content-box">
<header class="content-box-head container-fluid">
<h3>Delegated Prefixes</h3>
</header>
<h3>Delegated Prefixes</h3>
</header>
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
@ -544,7 +544,7 @@ if(count($pools) > 0) {
$fspans = "";
$fspane = "&nbsp;";
}
if ($data['act'] == "static") {
foreach ($config['dhcpdv6'] as $dhcpif => $dhcpifconf) {
if(is_array($dhcpifconf['staticmap'])) {
@ -581,11 +581,11 @@ if(count($pools) > 0) {
}
}
?>
</table>
</table>
</div>
</div>
</section>
<section class="col-xs-12">
<form action="status_dhcpv6_leases.php" method="get">
@ -607,4 +607,4 @@ if(count($pools) > 0) {
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

22
src/www/status_filter_reload.php
View File

@ -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");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="content-box ">
<div class="col-xs-12">
<br />
<div class="col-xs-12">
<br />
<form action="status_filter_reload.php" method="post" name="filter">
<input type="submit" value="Reload Filter" class="btn btn-primary" name="reloadfilter" id="reloadfilter" />
<?php if ($config['hasync'] && $config['hasync']["synchronizetoip"] != ""): ?>
@ -88,16 +88,16 @@ include("head.inc");
<?php endif; ?>
</form>
<br /><br /><br />
<div id="status" class="well">
<?php echo $status; ?>
</div>
<div id="doneurl">
</div>
<br/>
<div id="reloadinfo"><?=gettext("This page will automatically refresh every 3 seconds until the filter is done reloading"); ?>.</div>
</div>
</div>

64
src/www/status_gateway_groups.php
View File

@ -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");
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<?php
<?php
/* active tabs */
$tab_array = array();
$tab_array[] = array(gettext("Gateways"), false, "status_gateways.php");
$tab_array[] = array(gettext("Gateway Groups"), true, "status_gateway_groups.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="tab-content content-box col-xs-12">
<div class="responsive-table">
<table class="table table-striped table-sort">
<thead>
<thead>
<tr>
<td width="20%" class="listhdrr"><?=gettext("Group Name"); ?></td>
<td width="50%" class="listhdrr"><?=gettext("Gateways"); ?></td>
<td width="30%" class="listhdr"><?=gettext("Description"); ?></td>
</tr>
</thead>
<tbody>
</thead>
<tbody>
<?php $i = 0; foreach ($a_gateway_groups as $gateway_group): ?>
<tr>
<td class="listlr">
<?php
echo $gateway_group['name'];
?>
</td>
<td class="listr">
<table border='0'>
@ -110,13 +110,13 @@ include("head.inc");
}
$priority_count = count($priorities);
ksort($priorities);
echo "<tr>";
foreach($priorities as $number => $tier) {
echo "<td width='120'>" . sprintf(gettext("Tier %s"), $number) . "</td>";
}
echo "</tr>\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");
</td>
</tr>
<?php $i++; endforeach; ?>
</tbody>
</tbody>
</table>
</div>
</div>

50
src/www/status_gateways.php
View File

@ -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");
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<?php
<?php
/* active tabs */
$tab_array = array();
$tab_array[] = array(gettext("Gateways"), true, "status_gateways.php");
$tab_array[] = array(gettext("Gateway Groups"), false, "status_gateway_groups.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="tab-content content-box col-xs-12">
<div class="responsive-table">
<table class="table table-striped table-sort">
<thead>
<tr>
<td width="10%" class="listhdrr"><?=gettext("Name"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Gateway"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Monitor"); ?></td>
<td width="8%" class="listhdrr"><?=gettext("RTT"); ?></td>
<td width="7%" class="listhdrr"><?=gettext("Loss"); ?></td>
<td width="35%" class="listhdrr"><?=gettext("Status"); ?></td>
<td width="20%" class="listhdr"><?=gettext("Description"); ?></td>
</tr>
</thead>
<tbody>
<thead>
<tr>
<td width="10%" class="listhdrr"><?=gettext("Name"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Gateway"); ?></td>
<td width="10%" class="listhdrr"><?=gettext("Monitor"); ?></td>
<td width="8%" class="listhdrr"><?=gettext("RTT"); ?></td>
<td width="7%" class="listhdrr"><?=gettext("Loss"); ?></td>
<td width="35%" class="listhdrr"><?=gettext("Status"); ?></td>
<td width="20%" class="listhdr"><?=gettext("Description"); ?></td>
</tr>
</thead>
<tbody>
<?php foreach ($a_gateways as $gname => $gateway) {
?>
<tr>
@ -101,7 +101,7 @@ include("head.inc");
<?php echo lookup_gateway_ip_by_name($gname);?>
</td>
<td class="listr" align="center" >
<?php if ($gateways_status[$gname])
<?php if ($gateways_status[$gname])
echo $gateways_status[$gname]['monitorip'];
else
echo $gateway['monitorip'];
@ -159,7 +159,7 @@ include("head.inc");
echo "</td></tr></table></td></tr>";
?>
</table>
<td class="listbg"> <?=$gateway['descr']; ?></td>
</tr>
<?php } ?>

60
src/www/status_graph.php
View File

@ -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){
<?php
/* link the ipsec interface magically */
if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enable']))
$ifdescrs['enc0'] = "IPsec";
?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="content-box">
<form name="form1" action="status_graph.php" method="get">
<div class="table-responsive" >
<table class="table table-striped" style="margin-bottom:0;">
<thead>
<tr>
<th><?=gettext("Interface"); ?></th>
<th>Sort by</th>
<th>Filter</th>
<th>Display</th>
</tr>
</thead>
<tbody>
<tr>
<td><select id="if" name="if" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<thead>
<tr>
<th><?=gettext("Interface"); ?></th>
<th>Sort by</th>
<th>Filter</th>
<th>Display</th>
</tr>
</thead>
<tbody>
<tr>
<td><select id="if" name="if" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<?php
foreach ($ifdescrs as $ifn => $ifd) {
echo "<option value=\"$ifn\"";
@ -237,34 +237,34 @@ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enabl
}
?>
</select></td>
<td><select id="sort" name="sort" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<td><select id="sort" name="sort" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<option value="">Bw In</option>
<option value="out"<?php if ($cursort == "out") echo " selected=\"selected\"";?>>Bw Out</option>
</select></td>
<td><select id="filter" name="filter" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<td><select id="filter" name="filter" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<option value="local"<?php if ($curfilter == "local") echo " selected=\"selected\"";?>>Local</option>
<option value="remote"<?php if ($curfilter == "remote") echo " selected=\"selected\"";?>>Remote</option>
<option value="all"<?php if ($curfilter == "all") echo " selected=\"selected\"";?>>All</option>
</select></td>
<td><select id="hostipformat" name="hostipformat" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<td><select id="hostipformat" name="hostipformat" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<option value="">IP Address</option>
<option value="hostname"<?php if ($curhostipformat == "hostname") echo " selected";?>>Host Name</option>
<option value="fqdn"<?php if ($curhostipformat == "fqdn") echo " selected=\"selected\"";?>>FQDN</option>
</select></td>
</tr>
</tbody>
</tr>
</tbody>
</table>
</div>
</form>
</div>
</section>
<section class="col-xs-12">
<div class="content-box">
<div id="niftyOutter" class="col-xs-12">
<div id="col1" style="float: left; width: 46%; padding: 5px; position: relative;">
<object data="graph.php?ifnum=<?=htmlspecialchars($curif);?>&amp;ifname=<?=rawurlencode($ifdescrs[htmlspecialchars($curif)]);?>">
@ -380,4 +380,4 @@ if (isset($config['ipsec']['enable']) || isset($config['ipsec']['client']['enabl
jQuery(document).ready(updateBandwidth);
//]]>
</script>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

14
src/www/status_graph_cpu.php
View File

@ -1,21 +1,21 @@
<?php
<?php
/*
$Id$
part of m0n0wall (http://m0n0.ch/wall)
Copyright (C) 2003-2006 Manuel Kasper <mk@neon1.net>.
All rights reserved.
Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
@ -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
*/

764
src/www/status_interfaces.php
View File

@ -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");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<div class="table-responsive">
<table class="table table-striped">
<?php
$i = 0;
<?php
$i = 0;
$ifdescrs = get_configured_interface_with_descr(false, true);
foreach ($ifdescrs as $ifdescr => $ifname):
$ifinfo = get_interface_info($ifdescr);
// Load MAC-Manufacturer table
$mac_man = load_mac_manufacturer_table();
?>
<thead>
<tr>
<th colspan="2" class="listtopic">
<?=htmlspecialchars($ifname);?> <?=gettext("interface"); ?> (<?=htmlspecialchars($ifdescr);?>, <?=htmlspecialchars($ifinfo['hwif']);?>)
</th>
</tr>
<tr>
<th colspan="2" class="listtopic">
<?=htmlspecialchars($ifname);?> <?=gettext("interface"); ?> (<?=htmlspecialchars($ifdescr);?>, <?=htmlspecialchars($ifinfo['hwif']);?>)
</th>
</tr>
</thead>
<tbody>
<tr>
<td width="22%" class="vncellt"><?=gettext("Status"); ?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['status']);?>
</td>
</tr>
<?php if ($ifinfo['dhcplink']): ?>
<tr>
<td width="22%" class="vncellt">
DHCP
</td>
<td width="78%" class="listr">
<form name="dhcplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['dhcplink']; ?>" />
<?=htmlspecialchars($ifinfo['dhcplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['dhcplink'] == "up" ? gettext("Release") : gettext("Renew")); ?>
<input type="submit" name="submit" class="btn btn-primary btn-xs" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif;
if ($ifinfo['dhcp6link']): ?>
<tr>
<td width="22%" class="vncellt">
DHCP6
</td>
<td width="78%" class="listr">
<form name="dhcp6link_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['dhcp6link']; ?>" />
<?=htmlspecialchars($ifinfo['dhcp6link']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['dhcp6link'] == "up" ? gettext("Release") : gettext("Renew")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['pppoelink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPPoE"); ?></td>
<td width="78%" class="listr">
<form name="pppoelink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['pppoelink']; ?>" />
<?=htmlspecialchars($ifinfo['pppoelink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['pppoelink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['pptplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPTP"); ?></td>
<td width="78%" class="listr">
<form name="pptplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['pptplink']; ?>" />
<?=htmlspecialchars($ifinfo['pptplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['pptplink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['l2tplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("L2TP"); ?></td>
<td width="78%" class="listr">
<form name="l2tplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['l2tplink']; ?>" />
<?=htmlspecialchars($ifinfo['l2tplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['l2tplink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['ppplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPP"); ?></td>
<td width="78%" class="listr">
<form name="ppplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['ppplink']; ?>" />
<?=htmlspecialchars($ifinfo['pppinfo']);?>
<?php if ($ifinfo['ppplink'] == "up"): ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo gettext("Disconnect"); ?>" />
<?php else: ?>
<?php if (!$ifinfo['nodevice']): ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo gettext("Connect"); ?>" />
<?php endif; ?>
<?php endif; ?>
</form>
</td>
</tr>
<?php endif; if ($ifinfo['ppp_uptime'] || $ifinfo['ppp_uptime_accumulated']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Uptime ");?><?php if ($ifinfo['ppp_uptime_accumulated']) echo "(historical)"; ?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ppp_uptime']);?> <?=htmlspecialchars($ifinfo['ppp_uptime_accumulated']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_rssi']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Signal (RSSI)");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_rssi']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_mode']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Mode");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_mode']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_simstate']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell SIM State");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_simstate']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_service']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Service");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_service']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_bwupstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Upstream");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_bwupstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_bwdownstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Downstream");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_bwdownstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_upstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Current Up");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_upstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_downstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Current Down");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_downstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['macaddr']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("MAC address");?></td>
<td width="78%" class="listr">
<?php
$mac=$ifinfo['macaddr'];
$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
if(isset($mac_man[$mac_hi])){ print "<span>" . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print "</span>"; }
else {print htmlspecialchars($mac);}
?>
</td>
</tr>
<?php endif; if ($ifinfo['status'] != "down"): ?>
<?php if ($ifinfo['dhcplink'] != "down" && $ifinfo['pppoelink'] != "down" && $ifinfo['pptplink'] != "down"): ?>
<?php if ($ifinfo['ipaddr']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv4 address");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ipaddr']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['subnet']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Subnet mask IPv4");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['subnet']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['gateway']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Gateway IPv4");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($config['interfaces'][$ifdescr]['gateway']);?>
<?=htmlspecialchars($ifinfo['gateway']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['linklocal']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv6 Link Local");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['linklocal']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['ipaddrv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv6 address");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ipaddrv6']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['subnetv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Subnet mask IPv6");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['subnetv6']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['gatewayv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Gateway IPv6");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($config['interfaces'][$ifdescr]['gatewayv6']);?>
<?=htmlspecialchars($ifinfo['gatewayv6']);?>
</td>
</tr>
<?php endif; if ($ifdescr == "wan" && file_exists("{$g['varetc_path']}/resolv.conf")): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("ISP DNS servers");?></td>
<td width="78%" class="listr">
<?php
$dns_servers = get_dns_servers();
foreach($dns_servers as $dns) {
echo "{$dns}<br />";
}
?>
</td>
</tr>
<?php endif; endif; if ($ifinfo['media']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Media");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['media']);?>
</td>
</tr>
<?php endif; if ($ifinfo['laggproto']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("LAGG Protocol");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['laggproto']);?>
</td>
</tr>
<?php endif; if (is_array($ifinfo['laggport'])): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("LAGG Ports");?></td>
<td width="78%" class="listr">
<?php foreach ($ifinfo['laggport'] as $laggport) { ?>
<?php echo htmlspecialchars($laggport); ?><br />
<?php } ?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("Status"); ?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['status']);?>
</td>
</tr>
<?php if ($ifinfo['dhcplink']): ?>
<tr>
<td width="22%" class="vncellt">
DHCP
</td>
<td width="78%" class="listr">
<form name="dhcplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['dhcplink']; ?>" />
<?=htmlspecialchars($ifinfo['dhcplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['dhcplink'] == "up" ? gettext("Release") : gettext("Renew")); ?>
<input type="submit" name="submit" class="btn btn-primary btn-xs" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif;
if ($ifinfo['dhcp6link']): ?>
<tr>
<td width="22%" class="vncellt">
DHCP6
</td>
<td width="78%" class="listr">
<form name="dhcp6link_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['dhcp6link']; ?>" />
<?=htmlspecialchars($ifinfo['dhcp6link']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['dhcp6link'] == "up" ? gettext("Release") : gettext("Renew")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['pppoelink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPPoE"); ?></td>
<td width="78%" class="listr">
<form name="pppoelink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['pppoelink']; ?>" />
<?=htmlspecialchars($ifinfo['pppoelink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['pppoelink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['pptplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPTP"); ?></td>
<td width="78%" class="listr">
<form name="pptplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['pptplink']; ?>" />
<?=htmlspecialchars($ifinfo['pptplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['pptplink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['l2tplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("L2TP"); ?></td>
<td width="78%" class="listr">
<form name="l2tplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['l2tplink']; ?>" />
<?=htmlspecialchars($ifinfo['l2tplink']);?>&nbsp;&nbsp;
<?php $action = ($ifinfo['l2tplink'] == "up" ? gettext("Disconnect") : gettext("Connect")); ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo $action; ?>" />
</form>
</td>
</tr>
<?php endif; if ($ifinfo['ppplink']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("PPP"); ?></td>
<td width="78%" class="listr">
<form name="ppplink_form" action="status_interfaces.php" method="post">
<input type="hidden" name="if" value="<?php echo $ifdescr; ?>" />
<input type="hidden" name="status" value="<?php echo $ifinfo['ppplink']; ?>" />
<?=htmlspecialchars($ifinfo['pppinfo']);?>
<?php if ($ifinfo['ppplink'] == "up"): ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo gettext("Disconnect"); ?>" />
<?php else: ?>
<?php if (!$ifinfo['nodevice']): ?>
<input type="submit" name="submit" class="formbtn" value="<?php echo gettext("Connect"); ?>" />
<?php endif; ?>
<?php endif; ?>
</form>
</td>
</tr>
<?php endif; if ($ifinfo['ppp_uptime'] || $ifinfo['ppp_uptime_accumulated']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Uptime ");?><?php if ($ifinfo['ppp_uptime_accumulated']) echo "(historical)"; ?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ppp_uptime']);?> <?=htmlspecialchars($ifinfo['ppp_uptime_accumulated']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_rssi']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Signal (RSSI)");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_rssi']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_mode']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Mode");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_mode']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_simstate']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell SIM State");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_simstate']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_service']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Service");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_service']);?>
</td>
</tr>
<?php endif; if ($ifinfo['cell_bwupstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Upstream");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_bwupstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_bwdownstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Downstream");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_bwdownstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_upstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Current Up");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_upstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['cell_downstream']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Cell Current Down");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['cell_downstream']);?> kbit/s
</td>
</tr>
<?php endif; if ($ifinfo['macaddr']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("MAC address");?></td>
<td width="78%" class="listr">
<?php
$mac=$ifinfo['macaddr'];
$mac_hi = strtoupper($mac[0] . $mac[1] . $mac[3] . $mac[4] . $mac[6] . $mac[7]);
if(isset($mac_man[$mac_hi])){ print "<span>" . $mac . " - " . htmlspecialchars($mac_man[$mac_hi]); print "</span>"; }
else {print htmlspecialchars($mac);}
?>
</td>
</tr>
<?php endif; if ($ifinfo['status'] != "down"): ?>
<?php if ($ifinfo['dhcplink'] != "down" && $ifinfo['pppoelink'] != "down" && $ifinfo['pptplink'] != "down"): ?>
<?php if ($ifinfo['ipaddr']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv4 address");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ipaddr']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['subnet']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Subnet mask IPv4");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['subnet']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['gateway']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Gateway IPv4");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($config['interfaces'][$ifdescr]['gateway']);?>
<?=htmlspecialchars($ifinfo['gateway']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['linklocal']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv6 Link Local");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['linklocal']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['ipaddrv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("IPv6 address");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ipaddrv6']);?>
&nbsp;
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['subnetv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Subnet mask IPv6");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['subnetv6']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['gatewayv6']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Gateway IPv6");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($config['interfaces'][$ifdescr]['gatewayv6']);?>
<?=htmlspecialchars($ifinfo['gatewayv6']);?>
</td>
</tr>
<?php endif; if ($ifdescr == "wan" && file_exists("{$g['varetc_path']}/resolv.conf")): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("ISP DNS servers");?></td>
<td width="78%" class="listr">
<?php
$dns_servers = get_dns_servers();
foreach($dns_servers as $dns) {
echo "{$dns}<br />";
}
?>
</td>
</tr>
<?php endif; endif; if ($ifinfo['media']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Media");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['media']);?>
</td>
</tr>
<?php endif; if ($ifinfo['laggproto']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("LAGG Protocol");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['laggproto']);?>
</td>
</tr>
<?php endif; if (is_array($ifinfo['laggport'])): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("LAGG Ports");?></td>
<td width="78%" class="listr">
<?php foreach ($ifinfo['laggport'] as $laggport) { ?>
<?php echo htmlspecialchars($laggport); ?><br />
<?php } ?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['channel']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Channel");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['channel']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("Channel");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['channel']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['ssid']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("SSID");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ssid']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("SSID");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['ssid']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['bssid']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("BSSID");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['bssid']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("BSSID");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['bssid']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['rate']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Rate");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['rate']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("Rate");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['rate']);?>
</td>
</tr>
<?php endif; ?><?php if ($ifinfo['rssi']): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("RSSI");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['rssi']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("RSSI");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['rssi']);?>
</td>
</tr>
<?php endif; ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpkts'] . "/" . $ifinfo['outpkts'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytes']) . "/" . format_bytes($ifinfo['outbytes']) . ")");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets (pass)");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpktspass'] . "/" . $ifinfo['outpktspass'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytespass']) . "/" . format_bytes($ifinfo['outbytespass']) . ")");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets (block)");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpktsblock'] . "/" . $ifinfo['outpktsblock'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytesblock']) . "/" . format_bytes($ifinfo['outbytesblock']) . ")");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpkts'] . "/" . $ifinfo['outpkts'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytes']) . "/" . format_bytes($ifinfo['outbytes']) . ")");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets (pass)");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpktspass'] . "/" . $ifinfo['outpktspass'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytespass']) . "/" . format_bytes($ifinfo['outbytespass']) . ")");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out packets (block)");?></td>
<td width="78%" class="listr">
<?php
echo htmlspecialchars($ifinfo['inpktsblock'] . "/" . $ifinfo['outpktsblock'] . " (");
echo htmlspecialchars(format_bytes($ifinfo['inbytesblock']) . "/" . format_bytes($ifinfo['outbytesblock']) . ")");
?>
</td>
</tr>
<?php if (isset($ifinfo['inerrs'])): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out errors");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['inerrs'] . "/" . $ifinfo['outerrs']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("In/out errors");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['inerrs'] . "/" . $ifinfo['outerrs']);?>
</td>
</tr>
<?php endif; ?>
<?php if (isset($ifinfo['collisions'])): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Collisions");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['collisions']);?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("Collisions");?></td>
<td width="78%" class="listr">
<?=htmlspecialchars($ifinfo['collisions']);?>
</td>
</tr>
<?php endif; ?>
<?php endif; ?>
<?php if ($ifinfo['bridge']): ?>
<tr>
<td width="22%" class="vncellt"><?php printf(gettext("Bridge (%s)"),$ifinfo['bridgeint']);?></td>
<td width="78%" class="listr">
<?=$ifinfo['bridge'];?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?php printf(gettext("Bridge (%s)"),$ifinfo['bridgeint']);?></td>
<td width="78%" class="listr">
<?=$ifinfo['bridge'];?>
</td>
</tr>
<?php endif; ?>
<?php if(file_exists("/usr/bin/vmstat")): ?>
<?php
$real_interface = "";
$interrupt_total = "";
$interrupt_sec = "";
$real_interface = $ifinfo['hwif'];
$interrupt_total = `vmstat -i | grep $real_interface | awk '{ print $3 }'`;
$interrupt_sec = `vmstat -i | grep $real_interface | awk '{ print $4 }'`;
if(strstr($interrupt_total, "hci")) {
$interrupt_total = `vmstat -i | grep $real_interface | awk '{ print $4 }'`;
$interrupt_sec = `vmstat -i | grep $real_interface | awk '{ print $5 }'`;
}
unset($interrupt_total); // XXX: FIX ME! Need a regex and parse correct data 100% of the time.
?>
<?php if(file_exists("/usr/bin/vmstat")): ?>
<?php
$real_interface = "";
$interrupt_total = "";
$interrupt_sec = "";
$real_interface = $ifinfo['hwif'];
$interrupt_total = `vmstat -i | grep $real_interface | awk '{ print $3 }'`;
$interrupt_sec = `vmstat -i | grep $real_interface | awk '{ print $4 }'`;
if(strstr($interrupt_total, "hci")) {
$interrupt_total = `vmstat -i | grep $real_interface | awk '{ print $4 }'`;
$interrupt_sec = `vmstat -i | grep $real_interface | awk '{ print $5 }'`;
}
unset($interrupt_total); // XXX: FIX ME! Need a regex and parse correct data 100% of the time.
?>
<?php if($interrupt_total): ?>
<tr>
<td width="22%" class="vncellt"><?=gettext("Interrupts/Second");?></td>
<td width="78%" class="listr">
<?php
echo $interrupt_total . " " . gettext("total");
echo "<br />";
echo $interrupt_sec . " " . gettext("rate");
?>
</td>
</tr>
<tr>
<td width="22%" class="vncellt"><?=gettext("Interrupts/Second");?></td>
<td width="78%" class="listr">
<?php
echo $interrupt_total . " " . gettext("total");
echo "<br />";
echo $interrupt_sec . " " . gettext("rate");
?>
</td>
</tr>
<?php endif; ?>
<?php endif; ?>
<?php $i++; endforeach; ?>
</tbody>
</table>
<div class="col-xs-12">
<p><?php printf(gettext("Using dial-on-demand will bring the connection up again if any packet ".
"triggers it. To substantiate this point: disconnecting manually ".
@ -487,9 +487,9 @@ include("head.inc");
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

36
src/www/status_lb_pool.php
View File

@ -112,31 +112,31 @@ if ($_POST) {
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if (is_subsystem_dirty('loadbalancer')): ?><br/>
<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br />"));?>
<? endif; ?>
<section class="col-xs-12">
<?php
<?php
/* active tabs */
$tab_array = array();
$tab_array[] = array(gettext("Pools"), true, "status_lb_pool.php");
$tab_array[] = array(gettext("Virtual Servers"), false, "status_lb_vs.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="tab-content content-box col-xs-12">
<form action="status_lb_pool.php" method="post">
<div class="table-responsive">
<table class="table table-striped table-sort ">
<thead>
<thead>
<tr>
<td width="10%" class="listhdrr"><?=gettext("Name");?></td>
@ -145,10 +145,10 @@ if ($_POST) {
<td width="10%" class="listhdrr"><?=gettext("Monitor");?></td>
<td width="30%" class="listhdr"><?=gettext("Description");?></td>
</tr>
</thead>
<tbody>
<?php foreach ($a_pool as & $pool): ?>
<tr>
<td class="listlr">
@ -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) {
<?php endforeach; ?>
</tbody>
</table>
<div class="container-fluid">
<div class="container-fluid">
<input name="Submit" type="submit" class="btn btn-primary" value="<?= gettext("Save"); ?>" />
<input name="Reset" type="reset" class="btn btn-default" value="<?= gettext("Reset"); ?>" />
</div>
</form>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

24
src/www/status_lb_vs.php
View File

@ -63,28 +63,28 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if (is_subsystem_dirty('loadbalancer')): ?><br/>
<?php print_info_box_np(sprintf(gettext("The load balancer configuration has been changed%sYou must apply the changes in order for them to take effect."), "<br />"));?>
<? endif; ?>
<section class="col-xs-12">
<?php
<?php
/* active tabs */
$tab_array = array();
$tab_array[] = array(gettext("Pools"), false, "status_lb_pool.php");
$tab_array[] = array(gettext("Virtual Servers"), true, "status_lb_vs.php");
display_top_tabs($tab_array);
?>
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<div class="tab-content content-box col-xs-12">
<div class="container-fluid">
<form action="status_lb_pool.php" method="post">
<div class="table-responsive">
<table class="table table-striped table-sort __nomb">
<thead>
@ -154,12 +154,12 @@ include("head.inc");
<?php $i++; endforeach; ?>
</tbody>
</table>
</div>
</div>
</div>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

20
src/www/status_ntpd.php
View File

@ -166,22 +166,22 @@ include("head.inc");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<header class="content-box-head container-fluid">
<h3>Network Time Protocol Status</h3>
</header>
<div class="content-box-main">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<thead>
<tr>
@ -264,10 +264,10 @@ include("head.inc");
<td class="listlr" align="center"><?php echo sprintf("%.5f", $gps_lon); ?> (<?php echo sprintf("%d", $gps_lon_deg); ?>&deg; <?php echo sprintf("%.5f", $gps_lon_min*60); ?><?php echo $gps_vars[6]; ?>)</td>
<?php if (isset($gps_alt)) { echo '<td class="listlr" align="center">' . $gps_alt . ' ' . $gps_alt_unit . '</td>';}?>
<td class="listr" align="center">
<?php
<?php
if (isset($gps_satview)) {echo 'in view ' . intval($gps_satview);}
if (isset($gps_sat) && isset($gps_satview)) {echo ', ';}
if (isset($gps_sat)) {echo 'in use ' . $gps_sat;}
if (isset($gps_sat)) {echo 'in use ' . $gps_sat;}
?>
</td>
</tr>
@ -277,7 +277,7 @@ include("head.inc");
</tbody>
</table>
<?php endif; ?>
</div>
</div>
</div>
</div>
</section>

54
src/www/status_openvpn.php
View File

@ -143,25 +143,25 @@ include("head.inc"); ?>
//]]>
</script>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<header class="content-box-head container-fluid">
<h3>Network Time Protocol Status</h3>
</header>
<div class="content-box-main col-xs-12">
<form action="status_openvpn.php" method="get" name="iform">
<?php $i = 0; ?>
<?php foreach ($servers as $server): ?>
<div class="table-responsive">
<div class="table-responsive">
<table class="table table-striped table-sort sortable __nomb">
<tr>
<td colspan="6" class="listtopic">
@ -179,7 +179,7 @@ include("head.inc"); ?>
<td class="listhdrr"><?=gettext("Bytes Sent"); ?></td>
<td class="listhdrr"><?=gettext("Bytes Received"); ?></td>
</tr>
<?php foreach ($server['conns'] as $conn): ?>
<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
<td class="listlr">
@ -207,7 +207,7 @@ include("head.inc"); ?>
title="<?php echo gettext("Kill client connection from") . " " . $conn['remote_host']; ?>" alt="delete" />
</td>
</tr>
<?php endforeach; ?>
<tfoot>
<tr>
@ -230,7 +230,7 @@ include("head.inc"); ?>
<?php if (is_array($server['routes']) && count($server['routes'])): ?>
<div id="shroutebut-<?= $i ?>">
<input type="button" onClick="show_routes('tabroute-<?= $i ?>','shroutebut-<?= $i ?>')" value="<?php echo gettext("Show Routing Table"); ?>" /> - <?= gettext("Display OpenVPN's internal routing table for this server.") ?>
</div>
<table style="display: none; padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" id="tabroute-<?= $i ?>" summary="routing table">
<tr>
@ -247,7 +247,7 @@ include("head.inc"); ?>
<td class="listhdrr"><?=gettext("Target Network"); ?></td>
<td class="listhdrr"><?=gettext("Last Used"); ?></td>
</tr>
<?php foreach ($server['routes'] as $conn): ?>
<tr id="<?php echo "r:{$server['mgmt']}:{$conn['remote_host']}"; ?>">
<td class="listlr">
@ -263,7 +263,7 @@ include("head.inc"); ?>
<?=$conn['last_time'];?>
</td>
</tr>
<?php endforeach; ?>
<tfoot>
<tr>
@ -275,11 +275,11 @@ include("head.inc"); ?>
</tr>
</table>
<?php endif; ?>
<?php $i++; ?>
<?php endforeach; ?>
<?php if (!empty($sk_servers)) { ?>
<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" summary="peer to peer stats">
<tr>
@ -300,7 +300,7 @@ include("head.inc"); ?>
<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
<td class="listhdrr"><?=gettext("Service"); ?></td>
</tr>
<?php foreach ($sk_servers as $sk_server): ?>
<tr id="<?php echo "r:{$sk_server['port']}:{$sk_server['vpnid']}"; ?>">
<td class="listlr">
@ -339,10 +339,10 @@ include("head.inc"); ?>
</td>
</tr>
</table>
<?php
} ?>
<?php if (!empty($clients)) { ?>
<table style="padding-top:0px; padding-bottom:0px; padding-left:0px; padding-right:0px" width="100%" border="0" cellpadding="0" cellspacing="0" summary="client stats">
<tr>
@ -363,7 +363,7 @@ include("head.inc"); ?>
<td class="listhdrr"><?=gettext("Bytes Rcvd"); ?></td>
<td class="listhdrr"><?=gettext("Service"); ?></td>
</tr>
<?php foreach ($clients as $client): ?>
<tr id="<?php echo "r:{$client['port']}:{$client['vpnid']}"; ?>">
<td class="listlr">
@ -403,19 +403,19 @@ include("head.inc"); ?>
</tr>
</table>
</div>
<?php
<?php
}
if ($DisplayNote) {
echo "<br /><b>" . gettext("NOTE") . ":</b> " . 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");
}
?>
</form>
</div>
</div>
@ -424,7 +424,7 @@ include("head.inc"); ?>
</div>
</section>
<script type="text/javascript">
//<![CDATA[
function show_routes(id, buttonid) {
@ -433,6 +433,6 @@ function show_routes(id, buttonid) {
aodiv.style.display = "block";
}
//]]>
</script>
</script>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

46
src/www/status_queues.php
View File

@ -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");
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<section class="col-xs-12">
<div class="content-box">
<?php if(!is_array($config['shaper']['queue']) || count($config['shaper']['queue']) < 1): ?>
<header class="content-box-head container-fluid">
<h3><?php echo gettext("Traffic shaping is not configured."); ?></h3>
</header>
<? elseif ($error): ?>
<header class="content-box-head container-fluid">
<h3><?php echo $error; ?></h3>
</header>
<? else: ?>
<form action="status_queues.php" method="post">
<script type="text/javascript">
@ -169,11 +169,11 @@ include("head.inc");
});
//]]>
</script>
<div class="content-box-main col-xs-12">
<div class="table-responsive">
<table class="table table-striped table-sort sortable">
<tr>
<div class="table-responsive">
<table class="table table-striped table-sort sortable">
<tr>
<td class="listhdr"><?=gettext("Queue"); ?></td>
<td class="listhdr">
<?=gettext("Statistics"); ?>
@ -187,15 +187,15 @@ include("head.inc");
<td class="listhdr" width="1%"><?=gettext("Borrows"); ?></td>
<td class="listhdr" width="1%"><?=gettext("Suspends"); ?></td>
<td class="listhdr" width="1%"><?=gettext("Drops"); ?></td>
<td class="listhdr" width="1%"><?=gettext("Length"); ?></td>
<td class="listhdr" width="1%"><?=gettext("Length"); ?></td>
</tr>
<?php
<?php
$if_queue_list = get_configured_interface_list_by_realif(false, true);
processQueues($altqstats, 0, "")?>
</table>
</div>
</div>
<p>
<strong><span class="red"><?=gettext("Note"); ?>:</span></strong><br />
<?=gettext("Queue graphs take 5 seconds to sample data"); ?>.<br />
@ -203,7 +203,7 @@ include("head.inc");
</p>
</div>
</form>
<? endif; ?>
</div>
</section>
@ -225,7 +225,7 @@ include("head.inc");
</script>
<?php include("foot.inc"); ?>
<?php
<?php
function processQueues($altqstats, $level, $parent_name){
global $g;
global $if_queue_list;
@ -274,7 +274,7 @@ function processQueues($altqstats, $level, $parent_name){
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}borrows' id='queue{$q['name']}{$q['interface']}borrows' value='' align='right' /></td>";
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}suspends' id='queue{$q['name']}{$q['interface']}suspends' value='' align='right' /></td>";
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}drops' id='queue{$q['name']}{$q['interface']}drops' value='' align='right' /></td>";
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}length' id='queue{$q['name']}{$q['interface']}length' value='' align='right' /></td>";
echo "<td width=\"1%\" bgcolor=\"#{$row_background}\"><input style='border: 0px solid white; background-color:#{$row_background}; color:#000000;width:70px;text-align:right;' size='10' name='queue{$q['name']}{$q['interface']}length' id='queue{$q['name']}{$q['interface']}length' value='' align='right' /></td>";
?>
</tr>
<?php
@ -288,7 +288,7 @@ function statsQueues($xml){
$current = new QueueStats();
$child = new QueueStats();
$current->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']);

66
src/www/status_rrd_graph.php
View File

@ -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) {
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors && count($input_errors)) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<? include("status_rrd_graph_tabs.php"); ?>
<div class="tab-content content-box col-xs-12">
<?php if ($curcat == "captiveportal") : ?>
<? include("status_rrd_graph_tabs.php"); ?>
<div class="tab-content content-box col-xs-12">
<?php if ($curcat == "captiveportal") : ?>
<?php display_top_tabs($cp_zones_tab_array); ?>
<?php endif; ?>
<form name="form1" action="status_rrd_graph.php" method="get">
<input type="hidden" name="cat" value="<?php echo "$curcat"; ?>" />
<div class="container-fluid">
<p><b><?=gettext("Note: Change of color and/or style may not take effect until the next refresh");?></b></p>
</div>
<div id="responsive-table">
<table class="table table-striped table-sort __nomb">
<tr>
<td>
<?=gettext("Graphs:");?>
@ -441,7 +441,7 @@ function get_dates($curperiod, $graph) {
<?php endif; ?>
<select name="option" class="form-control" style="z-index: -10;" onchange="document.form1.submit()">
<?php
if($curcat == "custom") {
foreach ($custom_databases as $db => $database) {
$optionc = explode("-", $database);
@ -458,14 +458,14 @@ function get_dates($curperiod, $graph) {
foreach ($ui_databases as $db => $database) {
if(! preg_match("/($curcat)/i", $database))
continue;
if (($curcat == "captiveportal") && !empty($curzone) && !preg_match("/captiveportal-{$curzone}/i", $database))
continue;
$optionc = explode("-", $database);
$search = array("-", ".rrd", $optionc);
$replace = array(" :: ", "", $friendly);
switch($curcat) {
case "captiveportal":
$optionc = str_replace($search, $replace, $optionc[2]);
@ -494,7 +494,7 @@ function get_dates($curperiod, $graph) {
}
echo ">" . htmlspecialchars($prettyprint) . "</option>\n";
}
?>
</select>
</td>
@ -528,7 +528,7 @@ function get_dates($curperiod, $graph) {
}
?>
<?php
if($curcat == "custom") {
$tz = date_default_timezone_get();
$tz_msg = gettext("Enter date and/or time. Current timezone:") . " $tz";
@ -568,10 +568,10 @@ function get_dates($curperiod, $graph) {
foreach($ui_databases as $curdatabase) {
if(! preg_match("/($curcat)/i", $curdatabase))
continue;
if (($curcat == "captiveportal") && !empty($curzone) && !preg_match("/captiveportal-{$curzone}/i", $curdatabase))
continue;
$optionc = explode("-", $curdatabase);
$search = array("-", ".rrd", $optionc);
$replace = array(" :: ", "", $friendly);
@ -640,10 +640,10 @@ function get_dates($curperiod, $graph) {
</div>
</div>
</section>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<script type="text/javascript">
//<![CDATA[
function update_graph_images() {
@ -708,7 +708,7 @@ function get_dates($curperiod, $graph) {
/* generate update events utilizing jQuery('') feature */
$id = "{$graph}-{$curoption}-{$curdatabase}";
$id = preg_replace('/\./', '_', $id);
echo "\n";
echo "\t\tjQuery('#{$id}').attr('src','status_rrd_graph_img.php?start={$start}&graph={$graph}&database={$curdatabase}&style={$curstyle}&tmp=' + randomid);\n";
}
@ -719,11 +719,11 @@ function get_dates($curperiod, $graph) {
window.setTimeout('update_graph_images()', 355000);
//]]>
</script>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>

20
src/www/status_rrd_graph_img.php
View File

@ -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);

38
src/www/status_rrd_graph_settings.php
View File

@ -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");
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?>
<?php if ($savemsg) print_info_box($savemsg); ?>
<section class="col-xs-12">
<? include("status_rrd_graph_tabs.php"); ?>
<div class="tab-content content-box col-xs-12">
<? include("status_rrd_graph_tabs.php"); ?>
<div class="tab-content content-box col-xs-12">
<form action="status_rrd_graph_settings.php" method="post" name="iform" id="iform">
<div class="table-responsive">
<table class="table table-striped __nomb">
<table class="table table-striped __nomb">
<tr>
<td width="22%" valign="top" class="vtable"><?=gettext("RRD Graphs");?></td>
<td width="78%" class="vtable">
@ -155,7 +155,7 @@ include("head.inc");
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vtable"><?=gettext("Default category");?></td>
<td width="22%" valign="top" class="vtable"><?=gettext("Default category");?></td>
<td width="78%" class="vtable">
<select name="category" id="category" class="form-control" style="z-index: -10;" >
<?php
@ -170,7 +170,7 @@ include("head.inc");
</td>
</tr>
<tr>
<td width="22%" valign="top" class="vtable"><?=gettext("Default style");?></td>
<td width="22%" valign="top" class="vtable"><?=gettext("Default style");?></td>
<td width="78%" class="vtable">
<select name="style" class="form-control" style="z-index: -10;" >
<?php
@ -208,17 +208,17 @@ include("head.inc");
</tr>
</table>
</div>
<div class="container-fluid">
<div class="container-fluid">
<p><strong><span class="text-danger"><?=gettext("Note:");?></span></strong><br />
<?=gettext("Graphs will not be allowed to be recreated within a 1 minute interval, please " .
"take this into account after changing the style.");?>
</p>
</div>
</div>
</section>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

2
src/www/status_rrd_graph_tabs.php
View File

@ -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);
?>
?>

22
src/www/status_services.php
View File

@ -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");
?>
<section class="page-content-main">
<div class="container-fluid">
<div class="container-fluid">
<div class="row">
<?php if ($savemsg) print_info_box($savemsg); ?>
<section class="col-xs-12">
<div class="content-box">
<form action="status_services.php" method="post">
<div class="table-responsive">
<table class="table table-striped table-sort">
<thead>
@ -96,9 +96,9 @@ include("fbegin.inc");
</thead>
<tbody>
<?php
$services = get_services();
if (count($services) > 0) {
uasort($services, "service_name_compare");
foreach($services as $service) {
@ -127,7 +127,7 @@ include("fbegin.inc");
} else {
echo "<tr><td colspan=\"3\">" . gettext("No services found") . " . </td></tr>\n";
}
?>
</tbody>
</table>
@ -138,5 +138,5 @@ include("fbegin.inc");
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

48
src/www/status_upnp.php
View File

@ -62,28 +62,28 @@ include("head.inc");
<body>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if ($savemsg) print_info_box($savemsg); ?>
<section class="col-xs-12">
<div class="content-box">
<?php if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || !$config['installedpackages']['miniupnpd']['config'][0]['enable']): ?>
<header class="content-box-head container-fluid">
<h3><?php echo gettext("UPnP is currently disabled."); ?></h3>
</header>
<? else: ?>
<div class="row">
<?php if ($savemsg) print_info_box($savemsg); ?>
<section class="col-xs-12">
<div class="content-box">
<?php if(!$config['installedpackages'] || !$config['installedpackages']['miniupnpd']['config'][0]['iface_array'] || !$config['installedpackages']['miniupnpd']['config'][0]['enable']): ?>
<header class="content-box-head container-fluid">
<h3><?php echo gettext("UPnP is currently disabled."); ?></h3>
</header>
<? else: ?>
<div class="table-responsive">
<table class="table table-striped table-sort sortable">
<table class="table table-striped table-sort sortable">
<tr>
<td width="10%" class="listhdrr"><?=gettext("Port");?></td>
<td width="10%" class="listhdrr"><?=gettext("Protocol");?></td>
@ -119,16 +119,16 @@ include("head.inc");
<?php $i++; }?>
</table>
</div>
<form action="status_upnp.php" method="post">
<input type="submit" name="clear" id="clear" class="btn btn-primary" value="<?=gettext("Clear");?>" /> <?=gettext("all currently connected sessions");?>.
</form>
<? endif; ?>
</form>
<? endif; ?>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>

54
src/www/status_wireless.php
View File

@ -65,8 +65,8 @@ if(empty($if)) {
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<div class="row">
<?php if ($savemsg) print_info_box($savemsg); ?>
<?php
$tab_array = array();
@ -88,19 +88,19 @@ if(empty($if)) {
?>
<section class="col-xs-12">
<div class="content-box">
<div class="content-box">
<form action="status_wireless.php" method="post" name="iform" id="iform">
<input type="hidden" name="if" id="if" value="<?php echo htmlspecialchars($if); ?>">
<div class="col-xs-12">
<input type="submit" name="rescanwifi" id="rescanwifi" value="Rescan" class="btn btn-primary"/>
<input type="hidden" name="if" id="if" value="<?php echo htmlspecialchars($if); ?>">
<div class="col-xs-12">
<input type="submit" name="rescanwifi" id="rescanwifi" value="Rescan" class="btn btn-primary"/>
<p><?php echo gettext("Nearby access points or ad-hoc peers"); ?></p>
</div>
<div class="table-responsive">
<table class="table table-striped table-sort">
</div>
<div class="table-responsive">
<table class="table table-striped table-sort">
<thead>
<tr>
<td>SSID</td>
@ -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 "<tr>";
print "<td>{$ssid}</td>";
print "<td>{$bssid}</td>";
@ -146,8 +146,8 @@ if(empty($if)) {
?>
</tbody>
</table>
</div>
<div class="table-responsive">
</div>
<div class="table-responsive">
<p><?php echo gettext("Associated or ad-hoc peers"); ?></p>
<table class="table table-striped sortable" colspan="3" cellpadding="3" width="100%">
<thead>
@ -165,12 +165,12 @@ if(empty($if)) {
</tr>
</thead>
<tbody>
<?php
$states = array();
exec("/sbin/ifconfig {$rwlif} list sta 2>&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 "<td>{$split[9]}</td>";
print "</tr>\n";
}
/* XXX: what stats to we get for adhoc mode? */
?>
</tbody>
</table>
</div>
<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br />
</div>
<b>Flags:</b> A = authorized, E = Extended Rate (802.11g), P = Power save mode<br />
<b>Capabilities:</b> E = ESS (infrastructure mode), I = IBSS (ad-hoc mode), P = privacy (WEP/TKIP/AES),
S = Short preamble, s = Short slot time
</form>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
<?php include("foot.inc"); ?>