Skip to content

O
OpnSense
Commit f7deb7b9 authored by Ad Schellevis's avatar Ad Schellevis
Browse files
Options

(legacy) refactor interfaces_vlan.php, still some edit pages to go...

parent f6270966
Show whitespace changes
Inline Side-by-side
Showing with 138 additions and 127 deletions
src/www/interfaces_vlan.php
View file @ f7deb7b9
......@@ -30,51 +30,45 @@
require_once("guiconfig.inc");
require_once("interfaces.inc");
if (!is_array($config['vlans'])) {
$config['vlans'] = array();
}
if (!is_array($config['vlans']['vlan'])) {
$config['vlans']['vlan'] = array();
}
$a_vlans = &$config['vlans']['vlan'] ;
function vlan_inuse($num) {
global $config, $a_vlans;
$iflist = get_configured_interface_list(false, true);
foreach ($iflist as $if) {
if ($config['interfaces'][$if]['if'] == $a_vlans[$num]['vlanif'])
function vlan_inuse($vlan_intf) {
global $config;
foreach ($config['interfaces'] as $if => $intf) {
if ($intf['if'] == $vlan_intf) {
return true;
}
}
return false;
}
if ($_GET['act'] == "del") {
if (!isset($_GET['id']))
$input_errors[] = gettext("Wrong parameters supplied");
else if (empty($a_vlans[$_GET['id']]))
$input_errors[] = gettext("Wrong index supplied");
/* check if still in use */
else if (vlan_inuse($_GET['id'])) {
if (!isset($config['vlans']['vlan']) || !is_array($config['vlans']['vlan'])) {
$a_vlans = array();
} else {
$a_vlans = &$config['vlans']['vlan'] ;
}
if ($_SERVER['REQUEST_METHOD'] === 'POST') {
if (!empty($a_vlans[$_POST['id']])) {
$id = $_POST['id'];
}
if (!empty($_POST['action']) && $_POST['action'] == "del" && isset($id)) {
if (vlan_inuse($a_vlans[$id])) {
$input_errors[] = gettext("This VLAN cannot be deleted because it is still being used as an interface.");
} else {
if (does_interface_exist($a_vlans[$_GET['id']]['vlanif'])) {
legacy_interface_destroy($a_vlans[$_GET['id']]['vlanif']);
if (does_interface_exist($a_vlans[$id]['vlanif'])) {
legacy_interface_destroy($a_vlans[$id]['vlanif']);
}
unset($a_vlans[$_GET['id']]);
unset($a_vlans[$id]);
write_config();
header("Location: interfaces_vlan.php");
exit;
}
}
}
include("head.inc");
legacy_html_escape_form_data($a_vlans);
$main_buttons = array(
array('href'=>'interfaces_vlan_edit.php', 'label'=>gettext('Add')),
);
......@@ -82,70 +76,87 @@ $main_buttons = array(
?>
<body>
<?php include("fbegin.inc"); ?>
<script type="text/javascript">
$( document ).ready(function() {
// link delete buttons
$(".act_delete").click(function(event){
event.preventDefault();
var id = $(this).data("id");
// delete single
BootstrapDialog.show({
type:BootstrapDialog.TYPE_INFO,
title: "<?= gettext("VLAN");?>",
message: "<?=gettext("Do you really want to delete this VLAN?");?>",
buttons: [{
label: "<?= gettext("No");?>",
action: function(dialogRef) {
dialogRef.close();
}}, {
label: "<?= gettext("Yes");?>",
action: function(dialogRef) {
$("#id").val(id);
$("#action").val("del");
$("#iform").submit()
}
}]
});
});
});
</script>
<?php include("fbegin.inc"); ?>
<section class="page-content-main">
<div class="container-fluid">
<div class="row">
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<section class="col-xs-12">
<div class="tab-content content-box col-xs-12">
<form action="interfaces_assign.php" method="post" name="iform" id="iform">
<form method="post" name="iform" id="iform">
<input type="hidden" id="action" name="action" value="">
<input type="hidden" id="id" name="id" value="">
<div class="table-responsive">
<table class="table table-striped table-sort">
<table class="table table-striped">
<thead>
<tr>
<th width="20%" class="listtopic"><?=gettext("Interface");?></th>
<th width="20%" class="listtopic"><?=gettext("VLAN tag");?></th>
<th width="50%" class="listtopic"><?=gettext("Description");?></th>
<th width="10%" class="listtopic">&nbsp;</th>
<th><?=gettext("Interface");?></th>
<th><?=gettext("VLAN tag");?></th>
<th><?=gettext("Description");?></th>
<th>&nbsp;</th>
</tr>
</thead>
<tbody>
<?php $i = 0; foreach ($a_vlans as $vlan): ?>
<tr ondblclick="document.location='interfaces_vlan_edit.php?id=<?=$i;?>'">
<td class="listlr">
<?=htmlspecialchars($vlan['if']);?>
</td>
<td class="listr">
<?=htmlspecialchars($vlan['tag']);?>
</td>
<td class="listbg">
<?=htmlspecialchars($vlan['descr']);?>&nbsp;
</td>
<td valign="middle" class="list nowrap">
<a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit group");?>"><span class="glyphicon glyphicon-edit"></span></a>
<a href="interfaces_vlan.php?act=del&amp;id=<?=$i;?>" class="btn btn-default" data-toggle="tooltip" data-placement="left" title="<?=gettext("delete group");?>" onclick="return confirm('<?=gettext("Do you really want to delete this VLAN?");?>')"><span class="glyphicon glyphicon-remove"></span></a>
<?php
$i = 0;
foreach ($a_vlans as $vlan): ?>
<tr>
<td><?=$vlan['if'];?></td>
<td><?=$vlan['tag'];?></td>
<td><?=$vlan['descr'];?></td>
<td>
<a href="interfaces_vlan_edit.php?id=<?=$i;?>" class="btn btn-xs btn-default" data-toggle="tooltip" data-placement="left" title="<?=gettext("edit interface");?>">
<span class="glyphicon glyphicon-edit"></span>
</a>
<button title="<?=gettext("delete interface");?>" data-toggle="tooltip" data-placement="left" data-id="<?=$i;?>" class="btn btn-default btn-xs act_delete" type="submit">
<span class=" glyphicon glyphicon-remove"></span>
</button>
</td>
</tr>
<?php $i++; endforeach; ?>
<?php
$i++;
endforeach; ?>
</tbody>
</table>
</div>
<div class="container-fluid">
<p class="vexpl"><span class="text-danger"><strong>
<?=gettext("Note:");?><br />
</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>
<p>
<span class="text-danger"><strong><?=gettext("Note:");?><br /></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>
</div>
</form>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?>
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

Technounit-GROUP 2023