Commit d389da35 authored by Franco Fichtner's avatar Franco Fichtner

interfaces: apply whitespace cleanups

parent 99d02e9a
This diff is collapsed.
This diff is collapsed.
...@@ -72,7 +72,7 @@ if ($_GET['act'] == "del") { ...@@ -72,7 +72,7 @@ if ($_GET['act'] == "del") {
} else { } else {
mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy"); mwexec("/sbin/ifconfig " . $a_bridges[$_GET['id']]['bridgeif'] . " destroy");
} }
unset($a_bridges[$_GET['id']]); unset($a_bridges[$_GET['id']]);
write_config(); write_config();
...@@ -88,24 +88,24 @@ $shortcut_section = "interfaces"; ...@@ -88,24 +88,24 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_bridge_edit.php', 'label'=>'Add'), array('href'=>'interfaces_bridge_edit.php', 'label'=>'Add'),
); );
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -120,24 +120,24 @@ $main_buttons = array( ...@@ -120,24 +120,24 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_bridge.php" method="post" name="iform" id="iform"> <form action="interfaces_bridge.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Members");?></th> <th width="20%" class="listtopic"><?=gettext("Members");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; $ifdescrs = get_configured_interface_with_descr(); <?php $i = 0; $ifdescrs = get_configured_interface_with_descr();
foreach ($a_bridges as $bridge): ?> foreach ($a_bridges as $bridge): ?>
...@@ -161,20 +161,20 @@ $main_buttons = array( ...@@ -161,20 +161,20 @@ $main_buttons = array(
<td class="listbg"> <td class="listbg">
<?=htmlspecialchars($bridge['descr']);?>&nbsp; <?=htmlspecialchars($bridge['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_bridge_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_bridge_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_bridge.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this bridge?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_bridge.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this bridge?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p class="vexpl"><span class="text-danger"><strong> <p class="vexpl"><span class="text-danger"><strong>
<?=gettext("Note:"); ?><br /> <?=gettext("Note:"); ?><br />
...@@ -182,13 +182,13 @@ $main_buttons = array( ...@@ -182,13 +182,13 @@ $main_buttons = array(
<?=gettext("Here you can configure bridging of interfaces."); ?> <?=gettext("Here you can configure bridging of interfaces."); ?>
</p> </p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -264,25 +264,25 @@ function show_source_port_range() { ...@@ -264,25 +264,25 @@ function show_source_port_range() {
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("Bridge configuration");?></h3> <h3><?=gettext("Bridge configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_bridge_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_bridge_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -434,7 +434,7 @@ function show_source_port_range() { ...@@ -434,7 +434,7 @@ function show_source_port_range() {
"The minimum is 1 and the maximum is 200000000."); ?> "The minimum is 1 and the maximum is 200000000."); ?>
</span> </span>
</td></tr> </td></tr>
</table> </table>
</td></tr> </td></tr>
<tr style="display:none" id="sprtable2"> <tr style="display:none" id="sprtable2">
...@@ -461,7 +461,7 @@ function show_source_port_range() { ...@@ -461,7 +461,7 @@ function show_source_port_range() {
<tr style="display:none" id="sprtable4"> <tr style="display:none" id="sprtable4">
<td valign="top" class="vncell"><?=gettext("Span port"); ?></td> <td valign="top" class="vncell"><?=gettext("Span port"); ?></td>
<td class="vtable"> <td class="vtable">
<select name="span" class="form-control" id="span"> <select name="span" class="form-control" id="span">
<option value="none" selected="selected"><?=gettext("None"); ?></option> <option value="none" selected="selected"><?=gettext("None"); ?></option>
<?php <?php
foreach ($ifacelist as $ifn => $ifdescr) { foreach ($ifacelist as $ifn => $ifdescr) {
...@@ -626,12 +626,12 @@ function show_source_port_range() { ...@@ -626,12 +626,12 @@ function show_source_port_range() {
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -51,7 +51,7 @@ function gif_inuse($num) { ...@@ -51,7 +51,7 @@ function gif_inuse($num) {
$iflist = get_configured_interface_list(false, true); $iflist = get_configured_interface_list(false, true);
foreach ($iflist as $if) { foreach ($iflist as $if) {
if ($config['interfaces'][$if]['if'] == $a_gifs[$num]['gifif']) if ($config['interfaces'][$if]['if'] == $a_gifs[$num]['gifif'])
return true; return true;
} }
...@@ -82,24 +82,24 @@ $shortcut_section = "interfaces"; ...@@ -82,24 +82,24 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_gif_edit.php', 'label'=>'Add'), array('href'=>'interfaces_gif_edit.php', 'label'=>'Add'),
); );
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -114,25 +114,25 @@ $main_buttons = array( ...@@ -114,25 +114,25 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Tunnel to...");?></th> <th width="20%" class="listtopic"><?=gettext("Tunnel to...");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_gifs as $gif): ?> <?php $i = 0; foreach ($a_gifs as $gif): ?>
<tr ondblclick="document.location='interfaces_gif_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_gif_edit.php?id=<?=$i;?>'">
<td class="listlr"> <td class="listlr">
...@@ -145,18 +145,18 @@ $main_buttons = array( ...@@ -145,18 +145,18 @@ $main_buttons = array(
<?=htmlspecialchars($gif['descr']);?>&nbsp; <?=htmlspecialchars($gif['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_gif_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_gif_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_gif.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this gif tunnel?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_gif.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this gif tunnel?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p class="vexpl"><span class="red"><strong> <p class="vexpl"><span class="red"><strong>
<?=gettext("Note:"); ?><br /> <?=gettext("Note:"); ?><br />
...@@ -165,7 +165,7 @@ $main_buttons = array( ...@@ -165,7 +165,7 @@ $main_buttons = array(
<br /><br /> <br /><br />
<?php echo gettext("If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker on a WAN with a dynamic IP, you may want to add a"); ?> <a href="services_dyndns.php"><?php echo gettext("HE.net Tunnelbroker type DynDNS Entry"); ?></a> <?php echo gettext("to keep your tunnel functional when your IP changes."); ?></p> <?php echo gettext("If you are using a GIF tunnel to connect to a Hurricane Electric (he.net) Tunnel Broker on a WAN with a dynamic IP, you may want to add a"); ?> <a href="services_dyndns.php"><?php echo gettext("HE.net Tunnelbroker type DynDNS Entry"); ?></a> <?php echo gettext("to keep your tunnel functional when your IP changes."); ?></p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
...@@ -173,4 +173,4 @@ $main_buttons = array( ...@@ -173,4 +173,4 @@ $main_buttons = array(
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -143,25 +143,25 @@ include("head.inc"); ...@@ -143,25 +143,25 @@ include("head.inc");
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("GIF configuration");?></h3> <h3><?=gettext("GIF configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_gif_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_gif_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -182,7 +182,7 @@ include("head.inc"); ...@@ -182,7 +182,7 @@ include("head.inc");
echo " selected=\"selected\""; echo " selected=\"selected\"";
echo ">" . htmlspecialchars($ifinfo) . "</option>\n"; echo ">" . htmlspecialchars($ifinfo) . "</option>\n";
} }
?> ?>
</select> </select>
<br /> <br />
<span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the gif tunnel."); ?></span></td> <span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the gif tunnel."); ?></span></td>
...@@ -232,7 +232,7 @@ include("head.inc"); ...@@ -232,7 +232,7 @@ include("head.inc");
<br /> <br />
<span class="vexpl"> <span class="vexpl">
<?=gettext("Note that the ECN friendly behavior violates RFC2893. This should be " . <?=gettext("Note that the ECN friendly behavior violates RFC2893. This should be " .
"used in mutual agreement with the peer."); ?> "used in mutual agreement with the peer."); ?>
</span></td> </span></td>
</tr> </tr>
<tr> <tr>
...@@ -255,12 +255,12 @@ include("head.inc"); ...@@ -255,12 +255,12 @@ include("head.inc");
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -52,7 +52,7 @@ function gre_inuse($num) { ...@@ -52,7 +52,7 @@ function gre_inuse($num) {
$iflist = get_configured_interface_list(false, true); $iflist = get_configured_interface_list(false, true);
foreach ($iflist as $if) { foreach ($iflist as $if) {
if ($config['interfaces'][$if]['if'] == $a_gres[$num]['greif']) if ($config['interfaces'][$if]['if'] == $a_gres[$num]['greif'])
return true; return true;
} }
...@@ -83,24 +83,24 @@ $shortcut_section = "interfaces"; ...@@ -83,24 +83,24 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_gre_edit.php', 'label'=>'Add'), array('href'=>'interfaces_gre_edit.php', 'label'=>'Add'),
); );
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -115,25 +115,25 @@ $main_buttons = array( ...@@ -115,25 +115,25 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Tunnel to...");?></th> <th width="20%" class="listtopic"><?=gettext("Tunnel to...");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_gres as $gre): ?> <?php $i = 0; foreach ($a_gres as $gre): ?>
<tr ondblclick="document.location='interfaces_gre_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_gre_edit.php?id=<?=$i;?>'">
<td class="listlr"> <td class="listlr">
...@@ -146,28 +146,28 @@ $main_buttons = array( ...@@ -146,28 +146,28 @@ $main_buttons = array(
<?=htmlspecialchars($gre['descr']);?>&nbsp; <?=htmlspecialchars($gre['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_gre_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_gre_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_gre.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this GRE tunnel?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_gre.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this GRE tunnel?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></p> <p><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Here you can configure Generic Routing Encapsulation (GRE - RFC 2784) tunnels.");?></p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -135,29 +135,29 @@ include("head.inc"); ...@@ -135,29 +135,29 @@ include("head.inc");
<body> <body>
<script type="text/javascript" src="/javascript/jquery.ipv4v6ify.js"></script> <script type="text/javascript" src="/javascript/jquery.ipv4v6ify.js"></script>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("GRE configuration");?></h3> <h3><?=gettext("GRE configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_gre_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_gre_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -172,13 +172,13 @@ include("head.inc"); ...@@ -172,13 +172,13 @@ include("head.inc");
$aliaslist = get_configured_ip_aliases_list(); $aliaslist = get_configured_ip_aliases_list();
foreach ($aliaslist as $aliasip => $aliasif) foreach ($aliaslist as $aliasip => $aliasif)
$portlist[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")"; $portlist[$aliasif.'|'.$aliasip] = $aliasip." (".get_vip_descr($aliasip).")";
foreach ($portlist as $ifn => $ifinfo) { foreach ($portlist as $ifn => $ifinfo) {
echo "<option value=\"{$ifn}\""; echo "<option value=\"{$ifn}\"";
if ($ifn == $pconfig['if']) if ($ifn == $pconfig['if'])
echo " selected=\"selected\""; echo " selected=\"selected\"";
echo ">" . htmlspecialchars($ifinfo) . "</option>\n"; echo ">" . htmlspecialchars($ifinfo) . "</option>\n";
} }
?> ?>
</select> </select>
<br /> <br />
<span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the GRE tunnel.");?></span></td> <span class="vexpl"><?=gettext("The interface here serves as the local address to be used for the GRE tunnel.");?></span></td>
...@@ -260,12 +260,12 @@ include("head.inc"); ...@@ -260,12 +260,12 @@ include("head.inc");
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -75,14 +75,14 @@ $main_buttons = array( ...@@ -75,14 +75,14 @@ $main_buttons = array(
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), true, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), true, "interfaces_groups.php");
...@@ -97,27 +97,27 @@ $main_buttons = array( ...@@ -97,27 +97,27 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="15%" class="listtopic"><?=gettext("Name");?></th> <th width="15%" class="listtopic"><?=gettext("Name");?></th>
<th width="30%" class="listtopic"><?=gettext("Members");?></th> <th width="30%" class="listtopic"><?=gettext("Members");?></th>
<th width="25%" class="listtopic"><?=gettext("Description");?></th> <th width="25%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php if (count ($a_ifgroups)): <?php if (count ($a_ifgroups)):
$i = 0; foreach ($a_ifgroups as $ifgroupentry): ?> $i = 0; foreach ($a_ifgroups as $ifgroupentry): ?>
<tr> <tr>
...@@ -146,26 +146,26 @@ $main_buttons = array( ...@@ -146,26 +146,26 @@ $main_buttons = array(
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_groups_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_groups_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_groups.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this group? All elements that still use it will become invalid (e.g. filter rules)!");?>')" title="<?=gettext("delete ifgroupentry");?>"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_groups.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this group? All elements that still use it will become invalid (e.g. filter rules)!");?>')" title="<?=gettext("delete ifgroupentry");?>"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; endif;?> <?php $i++; endforeach; endif;?>
</tbody> </tbody>
</table> </table>
<div class="container-fluid"> <div class="container-fluid">
<p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?></span></p> <p><span class="vexpl"><span class="text-danger"><strong><?=gettext("Note:");?><br /></strong></span><?=gettext("Interface Groups allow you to create rules that apply to multiple interfaces without duplicating the rules. If you remove members from an interface group, the group rules no longer apply to that interface.");?></span></p>
</div> </div>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -241,25 +241,25 @@ function removeRow(el) { ...@@ -241,25 +241,25 @@ function removeRow(el) {
<input type='hidden' name='members_type' value='textbox' class="form-control unknown" /> <input type='hidden' name='members_type' value='textbox' class="form-control unknown" />
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("Interface Groups Edit");?></h3> <h3><?=gettext("Interface Groups Edit");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_groups_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_groups_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -288,7 +288,7 @@ function removeRow(el) { ...@@ -288,7 +288,7 @@ function removeRow(el) {
<tr> <tr>
<td><div id="onecolumn"><?=gettext("Interface");?></div></td> <td><div id="onecolumn"><?=gettext("Interface");?></div></td>
</tr> </tr>
<?php <?php
$counter = 0; $counter = 0;
$members = $pconfig['members']; $members = $pconfig['members'];
...@@ -311,7 +311,7 @@ function removeRow(el) { ...@@ -311,7 +311,7 @@ function removeRow(el) {
} }
echo ">{$ifdescr}</option>"; echo ">{$ifdescr}</option>";
} }
if ($found === false) if ($found === false)
foreach ($iflist_disabled as $ifnam => $ifdescr) foreach ($iflist_disabled as $ifnam => $ifdescr)
if ($ifnam == $members) if ($ifnam == $members)
...@@ -325,7 +325,7 @@ function removeRow(el) { ...@@ -325,7 +325,7 @@ function removeRow(el) {
</tr> </tr>
<?php <?php
$counter++; $counter++;
} // end foreach } // end foreach
} // end if } // end if
?> ?>
...@@ -353,14 +353,14 @@ function removeRow(el) { ...@@ -353,14 +353,14 @@ function removeRow(el) {
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<script type="text/javascript"> <script type="text/javascript">
//<![CDATA[ //<![CDATA[
...@@ -375,4 +375,4 @@ function removeRow(el) { ...@@ -375,4 +375,4 @@ function removeRow(el) {
unset($iflist); unset($iflist);
unset($iflist_disabled); unset($iflist_disabled);
include("foot.inc"); include("foot.inc");
?> ?>
\ No newline at end of file
...@@ -88,24 +88,24 @@ $shortcut_section = "interfaces"; ...@@ -88,24 +88,24 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_lagg_edit.php', 'label'=>'Add'), array('href'=>'interfaces_lagg_edit.php', 'label'=>'Add'),
); );
?> ?>
<body> <body>
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -120,26 +120,26 @@ $main_buttons = array( ...@@ -120,26 +120,26 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Members");?></th> <th width="20%" class="listtopic"><?=gettext("Members");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_laggs as $lagg): ?> <?php $i = 0; foreach ($a_laggs as $lagg): ?>
<tr ondblclick="document.location='interfaces_lagg_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_lagg_edit.php?id=<?=$i;?>'">
<td class="listlr"> <td class="listlr">
...@@ -152,18 +152,18 @@ $main_buttons = array( ...@@ -152,18 +152,18 @@ $main_buttons = array(
<?=htmlspecialchars($lagg['descr']);?>&nbsp; <?=htmlspecialchars($lagg['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_lagg_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_lagg_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_lagg.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this LAGG interface?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_lagg.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this LAGG interface?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p class="vexpl"><span class="text-danger"><strong> <p class="vexpl"><span class="text-danger"><strong>
<?=gettext("Note:"); ?><br /> <?=gettext("Note:"); ?><br />
...@@ -178,4 +178,4 @@ $main_buttons = array( ...@@ -178,4 +178,4 @@ $main_buttons = array(
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -144,25 +144,25 @@ include("head.inc"); ...@@ -144,25 +144,25 @@ include("head.inc");
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("LAGG configuration");?></h3> <h3><?=gettext("LAGG configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_lagg_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_lagg_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -258,12 +258,12 @@ include("head.inc"); ...@@ -258,12 +258,12 @@ include("head.inc");
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -79,7 +79,7 @@ $pgtitle = gettext("Interfaces: PPPs"); ...@@ -79,7 +79,7 @@ $pgtitle = gettext("Interfaces: PPPs");
$shortcut_section = "interfaces"; $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_ppps_edit.php', 'label'=>'Add'), array('href'=>'interfaces_ppps_edit.php', 'label'=>'Add'),
); );
?> ?>
...@@ -88,15 +88,15 @@ $main_buttons = array( ...@@ -88,15 +88,15 @@ $main_buttons = array(
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -111,28 +111,28 @@ $main_buttons = array( ...@@ -111,28 +111,28 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Interface(s)/Port(s)");?></th> <th width="20%" class="listtopic"><?=gettext("Interface(s)/Port(s)");?></th>
<th width="40%" class="listtopic"><?=gettext("Description");?></th> <th width="40%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_ppps as $id => $ppp): ?> <?php $i = 0; foreach ($a_ppps as $id => $ppp): ?>
<tr ondblclick="document.location='interfaces_ppps_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_ppps_edit.php?id=<?=$i;?>'">
<td class="listr"> <td class="listr">
<?=htmlspecialchars($ppp['if']);?> <?=htmlspecialchars($ppp['if']);?>
</td> </td>
<td class="listr"> <td class="listr">
...@@ -149,23 +149,23 @@ $main_buttons = array( ...@@ -149,23 +149,23 @@ $main_buttons = array(
<?=htmlspecialchars($ppp['descr']);?>&nbsp; <?=htmlspecialchars($ppp['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_ppps_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_ppps_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_ppps.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this PPP interface?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_ppps.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this PPP interface?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
This diff is collapsed.
...@@ -91,7 +91,7 @@ $shortcut_section = "interfaces"; ...@@ -91,7 +91,7 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_qinq_edit.php', 'label'=>'Add'), array('href'=>'interfaces_qinq_edit.php', 'label'=>'Add'),
); );
?> ?>
...@@ -100,15 +100,15 @@ $main_buttons = array( ...@@ -100,15 +100,15 @@ $main_buttons = array(
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -123,27 +123,27 @@ $main_buttons = array( ...@@ -123,27 +123,27 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="15%" class="listtopic"><?=gettext("Interface");?></th> <th width="15%" class="listtopic"><?=gettext("Interface");?></th>
<th width="10%" class="listtopic"><?=gettext("Tag");?></th> <th width="10%" class="listtopic"><?=gettext("Tag");?></th>
<th width="20%" class="listtopic"><?=gettext("QinQ members");?></th> <th width="20%" class="listtopic"><?=gettext("QinQ members");?></th>
<th width="45%" class="listtopic"><?=gettext("Description");?></th> <th width="45%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_qinqs as $qinq): ?> <?php $i = 0; foreach ($a_qinqs as $qinq): ?>
<tr ondblclick="document.location='interfaces_qinq_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_qinq_edit.php?id=<?=$i;?>'">
<td class="listlr"> <td class="listlr">
...@@ -163,30 +163,30 @@ $main_buttons = array( ...@@ -163,30 +163,30 @@ $main_buttons = array(
<td class="listbg"> <td class="listbg">
<?=htmlspecialchars($qinq['descr']);?>&nbsp; <?=htmlspecialchars($qinq['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_qinq_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_qinq_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_qinq_edit.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this QinQ?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_qinq_edit.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this QinQ?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p class="vexpl"><span class="text-danger"><strong> <p class="vexpl"><span class="text-danger"><strong>
<?=gettext("Note:");?><br /> <?=gettext("Note:");?><br />
</strong></span> </strong></span>
<?php printf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?></p> <?php printf(gettext("Not all drivers/NICs support 802.1Q QinQ tagging properly. On cards that do not explicitly support it, QinQ tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."), $g['product_name']);?></p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -25,7 +25,7 @@ ...@@ -25,7 +25,7 @@
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
/* /*
pfSense_BUILDER_BINARIES: /usr/sbin/ngctl pfSense_BUILDER_BINARIES: /usr/sbin/ngctl
pfSense_MODULE: interfaces pfSense_MODULE: interfaces
*/ */
...@@ -283,25 +283,25 @@ function removeRow(el) { ...@@ -283,25 +283,25 @@ function removeRow(el) {
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("Interface QinQ Edit");?></h3> <h3><?=gettext("Interface QinQ Edit");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_qinq_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_qinq_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -375,7 +375,7 @@ function removeRow(el) { ...@@ -375,7 +375,7 @@ function removeRow(el) {
<tr> <tr>
<td><div id="onecolumn"><?=gettext("Tag");?></div></td> <td><div id="onecolumn"><?=gettext("Tag");?></div></td>
</tr> </tr>
<?php <?php
$counter = 0; $counter = 0;
$members = $pconfig['members']; $members = $pconfig['members'];
...@@ -394,7 +394,7 @@ function removeRow(el) { ...@@ -394,7 +394,7 @@ function removeRow(el) {
</tr> </tr>
<?php <?php
$counter++; $counter++;
} // end foreach } // end foreach
} // end if } // end if
?> ?>
...@@ -416,9 +416,9 @@ function removeRow(el) { ...@@ -416,9 +416,9 @@ function removeRow(el) {
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
...@@ -434,4 +434,4 @@ function removeRow(el) { ...@@ -434,4 +434,4 @@ function removeRow(el) {
//]]> //]]>
</script> </script>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -85,7 +85,7 @@ $shortcut_section = "interfaces"; ...@@ -85,7 +85,7 @@ $shortcut_section = "interfaces";
include("head.inc"); include("head.inc");
$main_buttons = array( $main_buttons = array(
array('href'=>'interfaces_vlan_edit.php', 'label'=>'Add'), array('href'=>'interfaces_vlan_edit.php', 'label'=>'Add'),
); );
...@@ -95,15 +95,15 @@ $main_buttons = array( ...@@ -95,15 +95,15 @@ $main_buttons = array(
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -118,24 +118,24 @@ $main_buttons = array( ...@@ -118,24 +118,24 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("VLAN tag");?></th> <th width="20%" class="listtopic"><?=gettext("VLAN tag");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; foreach ($a_vlans as $vlan): ?> <?php $i = 0; foreach ($a_vlans as $vlan): ?>
<tr ondblclick="document.location='interfaces_vlan_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_vlan_edit.php?id=<?=$i;?>'">
<td class="listlr"> <td class="listlr">
...@@ -147,32 +147,32 @@ $main_buttons = array( ...@@ -147,32 +147,32 @@ $main_buttons = array(
<td class="listbg"> <td class="listbg">
<?=htmlspecialchars($vlan['descr']);?>&nbsp; <?=htmlspecialchars($vlan['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_vlan.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this VLAN?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_vlan.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this VLAN?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p class="vexpl"><span class="text-danger"><strong> <p class="vexpl"><span class="text-danger"><strong>
<?=gettext("Note:");?><br /> <?=gettext("Note:");?><br />
</strong></span> </strong></span>
<?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p> <?php printf(gettext("Not all drivers/NICs support 802.1Q VLAN tagging properly. On cards that do not explicitly support it, VLAN tagging will still work, but the reduced MTU may cause problems. See the %s handbook for information on supported cards."),$g['product_name']);?> </p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -141,7 +141,7 @@ if ($_POST) { ...@@ -141,7 +141,7 @@ if ($_POST) {
if ($confif <> "") if ($confif <> "")
interface_configure($confif); interface_configure($confif);
header("Location: interfaces_vlan.php"); header("Location: interfaces_vlan.php");
exit; exit;
} }
...@@ -158,25 +158,25 @@ include("head.inc"); ...@@ -158,25 +158,25 @@ include("head.inc");
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("VLAN configuration");?></h3> <h3><?=gettext("VLAN configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
...@@ -191,8 +191,8 @@ include("head.inc"); ...@@ -191,8 +191,8 @@ include("head.inc");
if ($ifn == $pconfig['if']) if ($ifn == $pconfig['if'])
echo " selected=\"selected\""; echo " selected=\"selected\"";
echo ">"; echo ">";
echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")"); echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")");
echo "</option>"; echo "</option>";
} }
?> ?>
</select> </select>
...@@ -226,11 +226,11 @@ include("head.inc"); ...@@ -226,11 +226,11 @@ include("head.inc");
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -90,15 +90,15 @@ $main_buttons = array( ...@@ -90,15 +90,15 @@ $main_buttons = array(
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<section class="col-xs-12"> <section class="col-xs-12">
<?php <?php
$tab_array = array(); $tab_array = array();
$tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php"); $tab_array[0] = array(gettext("Interface assignments"), false, "interfaces_assign.php");
$tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php"); $tab_array[1] = array(gettext("Interface Groups"), false, "interfaces_groups.php");
...@@ -113,25 +113,25 @@ $main_buttons = array( ...@@ -113,25 +113,25 @@ $main_buttons = array(
display_top_tabs($tab_array); 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="interfaces_assign.php" method="post" name="iform" id="iform"> <form action="interfaces_assign.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<thead> <thead>
<tr> <tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th> <th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("Mode");?></th> <th width="20%" class="listtopic"><?=gettext("Mode");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th> <th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th> <th width="10%" class="listtopic">&nbsp;</th>
</tr> </tr>
</thead> </thead>
<tbody> <tbody>
<?php $i = 0; <?php $i = 0;
foreach ($a_clones as $clone): ?> foreach ($a_clones as $clone): ?>
<tr ondblclick="document.location='interfaces_wireless_edit.php?id=<?=$i;?>'"> <tr ondblclick="document.location='interfaces_wireless_edit.php?id=<?=$i;?>'">
...@@ -145,31 +145,31 @@ $main_buttons = array( ...@@ -145,31 +145,31 @@ $main_buttons = array(
<?=htmlspecialchars($clone['descr']);?>&nbsp; <?=htmlspecialchars($clone['descr']);?>&nbsp;
</td> </td>
<td valign="middle" class="list nowrap"> <td valign="middle" class="list nowrap">
<a href="interfaces_wireless_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a> <a href="interfaces_wireless_edit.php?id=<?=$i;?>" class="btn btn-default"><span class="glyphicon glyphicon-edit" title="<?=gettext("edit group");?>"></span></a>
<a href="interfaces_wireless.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this wireless clone?");?>')"><span class="glyphicon glyphicon-remove"></span></a> <a href="interfaces_wireless.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" onclick="return confirm('<?=gettext("Do you really want to delete this wireless clone?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
<a href="interfaces_wireless_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" ></a> <a href="interfaces_wireless_edit.php?id=<?=$i;?>"><img src="./themes/<?= $g['theme']; ?>/images/icons/icon_e.gif" width="17" height="17" border="0" alt="edit" ></a>
</td> </td>
</tr> </tr>
<?php $i++; endforeach; ?> <?php $i++; endforeach; ?>
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="container-fluid"> <div class="container-fluid">
<p><span class="text-danger"><strong><?=gettext("Note");?>:<br /> <p><span class="text-danger"><strong><?=gettext("Note");?>:<br />
</strong></span> </strong></span>
<?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?></p> <?=gettext("Here you can configure clones of wireless interfaces, which can be assigned as separate independent interfaces. Only available on wireless chipsets that support this, with limitations on the number that can be created in each mode.");?></p>
</div> </div>
</form> </form>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
...@@ -156,25 +156,25 @@ include("head.inc"); ...@@ -156,25 +156,25 @@ include("head.inc");
<?php include("fbegin.inc"); ?> <?php include("fbegin.inc"); ?>
<section class="page-content-main"> <section class="page-content-main">
<div class="container-fluid"> <div class="container-fluid">
<div class="row"> <div class="row">
<?php if ($input_errors) print_input_errors($input_errors); ?> <?php if ($input_errors) print_input_errors($input_errors); ?>
<div id="inputerrors"></div> <div id="inputerrors"></div>
<section class="col-xs-12"> <section class="col-xs-12">
<div class="content-box"> <div class="content-box">
<header class="content-box-head container-fluid"> <header class="content-box-head container-fluid">
<h3><?=gettext("Wireless clone configuration");?></h3> <h3><?=gettext("Wireless clone configuration");?></h3>
</header> </header>
<div class="content-box-main"> <div class="content-box-main">
<form action="interfaces_wireless_edit.php" method="post" name="iform" id="iform"> <form action="interfaces_wireless_edit.php" method="post" name="iform" id="iform">
<div class="table-responsive"> <div class="table-responsive">
<table class="table table-striped table-sort"> <table class="table table-striped table-sort">
<tr> <tr>
...@@ -223,12 +223,12 @@ include("head.inc"); ...@@ -223,12 +223,12 @@ include("head.inc");
</tr> </tr>
</table> </table>
</div> </div>
</form> </form>
</div> </div>
</div> </div>
</section> </section>
</div> </div>
</div> </div>
</section> </section>
<?php include("foot.inc"); ?> <?php include("foot.inc"); ?>
\ No newline at end of file
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment