Skip to content

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

(legacy) refactor interfaces_vlan_edit.php

parent 5e3273eb
Hide whitespace changes
Inline Side-by-side
Showing with 208 additions and 209 deletions
src/www/interfaces_vlan_edit.php
View file @ 2b954b6b
<?php <?php
/* /*
Copyright (C) 2014-2015 Deciso B.V. Copyright (C) 2014-2016 Deciso B.V.
Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>. Copyright (C) 2003-2004 Manuel Kasper <mk@neon1.net>.
All rights reserved. All rights reserved.
Redistribution and use in source and binary forms, with or without Redistribution and use in source and binary forms, with or without
modification, are permitted provided that the following conditions are met: modification, are permitted provided that the following conditions are met:
1. Redistributions of source code must retain the above copyright notice, 1. Redistributions of source code must retain the above copyright notice,
this list of conditions and the following disclaimer. this list of conditions and the following disclaimer.
2. Redistributions in binary form must reproduce the above copyright 2. Redistributions in binary form must reproduce the above copyright
notice, this list of conditions and the following disclaimer in the notice, this list of conditions and the following disclaimer in the
documentation and/or other materials provided with the distribution. documentation and/or other materials provided with the distribution.
THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES, THIS SOFTWARE IS PROVIDED ``AS IS'' AND ANY EXPRESS OR IMPLIED WARRANTIES,
INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF MERCHANTABILITY
AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE AND FITNESS FOR A PARTICULAR PURPOSE ARE DISCLAIMED. IN NO EVENT SHALL THE
AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, AUTHOR BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY,
OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF
SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS
INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN
CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
POSSIBILITY OF SUCH DAMAGE. POSSIBILITY OF SUCH DAMAGE.
*/ */
require_once("guiconfig.inc"); require_once("guiconfig.inc");
...@@ -35,201 +35,200 @@ require_once("pfsense-utils.inc"); ...@@ -35,201 +35,200 @@ require_once("pfsense-utils.inc");
require_once("unbound.inc"); require_once("unbound.inc");
require_once("services.inc"); require_once("services.inc");
$referer = (isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_vlan.php'); if (!isset($config['vlans']) || !is_array($config['vlans'])) {
$config['vlans'] = array();
if (!is_array($config['vlans'])) {
$config['vlans'] = array();
} }
if (!isset($config['vlans']['vlan']) || !is_array($config['vlans']['vlan'])) {
if (!is_array($config['vlans']['vlan'])) { $config['vlans']['vlan'] = array();
$config['vlans']['vlan'] = array();
} }
$a_vlans = &$config['vlans']['vlan']; $a_vlans = &$config['vlans']['vlan'];
$portlist = get_interface_list(); if ($_SERVER['REQUEST_METHOD'] === 'GET') {
// read form data
/* add LAGG interfaces */ if (!empty($a_vlans[$_GET['id']])) {
if (isset($config['laggs']['lagg'])) { $id = $_GET['id'];
foreach ($config['laggs']['lagg'] as $lagg) { }
$portlist[$lagg['laggif']] = $lagg; $pconfig['if'] = isset($a_vlans[$id]['if']) ? $a_vlans[$id]['if'] : null;
} $pconfig['vlanif'] = isset($a_vlans[$id]['vlanif']) ? $a_vlans[$id]['vlanif'] : null;
} $pconfig['tag'] = isset($a_vlans[$id]['tag']) ? $a_vlans[$id]['tag'] : null;
$pconfig['descr'] = isset($a_vlans[$id]['descr']) ? $a_vlans[$id]['descr'] : null;
if (is_numericint($_GET['id'])) } elseif ($_SERVER['REQUEST_METHOD'] === 'POST') {
$id = $_GET['id']; // validate / save form data
if (isset($_POST['id']) && is_numericint($_POST['id'])) if (!empty($a_vlans[$_POST['id']])) {
$id = $_POST['id']; $id = $_POST['id'];
}
if (isset($id) && $a_vlans[$id]) {
$pconfig['if'] = $a_vlans[$id]['if']; $input_errors = array();
$pconfig['vlanif'] = $a_vlans[$id]['vlanif']; $pconfig = $_POST;
$pconfig['tag'] = $a_vlans[$id]['tag'];
$pconfig['descr'] = $a_vlans[$id]['descr']; /* input validation */
} $reqdfields = explode(" ", "if tag");
$reqdfieldsn = array(gettext("Parent interface"),gettext("VLAN tag"));
if ($_POST) {
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors);
unset($input_errors);
$pconfig = $_POST; if ($pconfig['tag'] && (!is_numericint($pconfig['tag']) || ($pconfig['tag'] < '1') || ($pconfig['tag'] > '4094'))) {
$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094.");
/* input validation */ }
$reqdfields = explode(" ", "if tag");
$reqdfieldsn = array(gettext("Parent interface"),gettext("VLAN tag")); if (!does_interface_exist($pconfig['if'])) {
$input_errors[] = gettext("Interface supplied as parent is invalid");
do_input_validation($_POST, $reqdfields, $reqdfieldsn, $input_errors); }
if ($_POST['tag'] && (!is_numericint($_POST['tag']) || ($_POST['tag'] < '1') || ($_POST['tag'] > '4094'))) { if (isset($id) && $pconfig['tag'] && $pconfig['tag'] != $a_vlans[$id]['tag']) {
$input_errors[] = gettext("The VLAN tag must be an integer between 1 and 4094."); if (!empty($a_vlans[$id]['vlanif']) && convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']) != NULL) {
} $input_errors[] = gettext("Interface is assigned and you cannot change the VLAN tag while assigned.");
}
if (!does_interface_exist($_POST['if'])) }
$input_errors[] = gettext("Interface supplied as parent is invalid");
foreach ($a_vlans as $vlan) {
if (isset($id)) { if (isset($id) && $a_vlans[$id] === $vlan) {
if ($_POST['tag'] && $_POST['tag'] != $a_vlans[$id]['tag']) { continue;
if (!empty($a_vlans[$id]['vlanif']) && convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']) != NULL) }
$input_errors[] = gettext("Interface is assigned and you cannot change the VLAN tag while assigned."); if (($vlan['if'] == $pconfig['if']) && ($vlan['tag'] == $_POST['tag'])) {
} $input_errors[] = sprintf(gettext("A VLAN with the tag %s is already defined on this interface."), $vlan['tag']);
} break;
foreach ($a_vlans as $vlan) { }
if (isset($id) && ($a_vlans[$id]) && ($a_vlans[$id] === $vlan)) }
continue; if (isset($config['qinqs']['qinqentry'])) {
foreach ($config['qinqs']['qinqentry'] as $qinq) {
if (($vlan['if'] == $_POST['if']) && ($vlan['tag'] == $_POST['tag'])) { if ($qinq['tag'] == $pconfig['tag'] && $qinq['if'] == $pconfig['if']) {
$input_errors[] = sprintf(gettext("A VLAN with the tag %s is already defined on this interface."),$vlan['tag']); $input_errors[] = gettext("A QinQ VLAN exists with this tag please remove it to use this tag with.");
break; }
} }
} }
if (isset($config['qinqs']['qinqentry'])) {
foreach ($config['qinqs']['qinqentry'] as $qinq) { if (count($input_errors) == 0) {
if ($qinq['tag'] == $_POST['tag'] && $qinq['if'] == $_POST['if']) { $confif = "";
$input_errors[] = gettext("A QinQ VLAN exists with this tag please remove it to use this tag with."); if (isset($id)) {
} if (($a_vlans[$id]['if'] != $pconfig['if']) || ($a_vlans[$id]['tag'] != $pconfig['tag'])) {
} if (!empty($a_vlans[$id]['vlanif'])) {
} $confif = convert_real_interface_to_friendly_interface_name($a_vlans[$id]['vlanif']);
legacy_interface_destroy($a_vlans[$id]['vlanif']);
if (!$input_errors) { } else {
if (isset($id) && $a_vlans[$id]) { legacy_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) { $confif = convert_real_interface_to_friendly_interface_name("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}");
if (!empty($a_vlans[$id]['vlanif'])) { }
$confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']); if ($confif <> "") {
legacy_interface_destroy($a_vlans[$id]['vlanif']); $config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}";
} else { }
legacy_interface_destroy("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}"); }
$confif = convert_real_interface_to_friendly_interface_name("{$a_vlans[$id]['if']}_vlan{$a_vlans[$id]['tag']}"); }
} $vlan = array();
if ($confif <> "") $vlan['if'] = $_POST['if'];
$config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}"; $vlan['tag'] = $_POST['tag'];
} $vlan['descr'] = $_POST['descr'];
} $vlan['vlanif'] = "{$_POST['if']}_vlan{$_POST['tag']}";
$vlan = array(); $vlan['vlanif'] = interface_vlan_configure($vlan);
$vlan['if'] = $_POST['if']; if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) {
$vlan['tag'] = $_POST['tag']; $input_errors[] = gettext("Error occurred creating interface, please retry.");
$vlan['descr'] = $_POST['descr']; } else {
$vlan['vlanif'] = "{$_POST['if']}_vlan{$_POST['tag']}"; if (isset($id)) {
$a_vlans[$id] = $vlan;
$vlan['vlanif'] = interface_vlan_configure($vlan); } else {
if ($vlan['vlanif'] == "" || !stristr($vlan['vlanif'], "vlan")) $a_vlans[] = $vlan;
$input_errors[] = gettext("Error occurred creating interface, please retry."); }
else { write_config();
if (isset($id) && $a_vlans[$id])
$a_vlans[$id] = $vlan; if ($confif <> "") {
else interface_configure($confif);
$a_vlans[] = $vlan; }
header("Location: interfaces_vlan.php");
write_config(); exit;
}
if ($confif <> "") }
interface_configure($confif);
header("Location: interfaces_vlan.php");
exit;
}
}
} }
include("head.inc"); include("head.inc");
?> ?>
<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 (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?>
<?php if (isset($input_errors) && count($input_errors) > 0) print_input_errors($input_errors); ?> <section class="col-xs-12">
<div id="inputerrors"></div> <div class="content-box">
<div class="table-responsive">
<form method="post" name="iform" id="iform">
<section class="col-xs-12"> <table class="table table-striped">
<thead>
<div class="content-box"> <tr>
<td width="22%"><strong><?=gettext("Interface QinQ Edit");?></strong></td>
<header class="content-box-head container-fluid"> <td width="78%" align="right">
<h3><?=gettext("VLAN configuration");?></h3> <small><?=gettext("full help"); ?> </small>
</header> <i class="fa fa-toggle-off text-danger" style="cursor: pointer;" id="show_all_help_page" type="button"></i></a>
&nbsp;
<div class="content-box-main"> </td>
</tr>
<form action="interfaces_vlan_edit.php" method="post" name="iform" id="iform"> </thead>
<tbody>
<div class="table-responsive"> <tr>
<table class="table table-striped table-sort"> <td><a id="help_for_if" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Parent interface");?></td>
<td>
<tr> <select name="if" class="selectpicker">
<td width="22%" valign="top" class="vncellreq"><?=gettext("Parent interface");?></td> <?php
<td width="78%" class="vtable"> $portlist = get_interface_list();
<select name="if" class="selectpicker"> /* add LAGG interfaces */
<?php if (isset($config['laggs']['lagg'])) {
foreach ($portlist as $ifn => $ifinfo) foreach ($config['laggs']['lagg'] as $lagg) {
if (is_jumbo_capable($ifn)) { $portlist[$lagg['laggif']] = $lagg;
echo "<option value=\"{$ifn}\""; }
if ($ifn == $pconfig['if']) }
echo " selected=\"selected\""; foreach ($portlist as $ifn => $ifinfo):
echo ">"; if (!is_jumbo_capable($ifn)) {
echo htmlspecialchars($ifn . " (" . $ifinfo['mac'] . ")"); continue;
echo "</option>"; }?>
} <option value="<?=$ifn;?>" <?=$ifn == $pconfig['if'] ? " selected=\"selected\"" : "";?>>
?> <?=htmlspecialchars($ifn);?> ( <?= !empty($ifinfo['mac']) ? $ifinfo['mac'] :"" ;?> )
</select> </option>
<br /> <?php
<span class="vexpl"><?=gettext("Only VLAN capable interfaces will be shown.");?></span></td> endforeach;?>
</tr>
<tr> </select>
<td valign="top" class="vncellreq"><?=gettext("VLAN tag ");?></td> <div class="hidden" for="help_for_if">
<td class="vtable"> <?=gettext("Only VLAN capable interfaces will be shown.");?>
<input name="tag" type="text" class="form-control unknown" id="tag" size="6" value="<?=htmlspecialchars($pconfig['tag']);?>" /> </div>
<br /> </td>
<span class="vexpl"><?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?></span></td> </tr>
</tr> <tr>
<tr> <td><a id="help_for_tag" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("VLAN tag ");?></td>
<td width="22%" valign="top" class="vncell"><?=gettext("Description");?></td> <td>
<td width="78%" class="vtable"> <input name="tag" type="text" value="<?=$pconfig['tag'];?>" />
<input name="descr" type="text" class="form-control unknown" id="descr" size="40" value="<?=htmlspecialchars($pconfig['descr']);?>" /> <div class="hidden" for="help_for_tag">
<br /> <span class="vexpl"><?=gettext("You may enter a description here ". <?=gettext("802.1Q VLAN tag (between 1 and 4094) ");?>
"for your reference (not parsed).");?></span></td> </div>
</tr> </td>
<tr> </tr>
<td width="22%" valign="top">&nbsp;</td> <tr>
<td width="78%"> <td><a id="help_for_descr" href="#" class="showhelp"><i class="fa fa-info-circle"></i></a> <?=gettext("Description"); ?></td>
<input type="hidden" name="vlanif" value="<?=htmlspecialchars($pconfig['vlanif']); ?>" /> <td>
<input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" /> <input name="descr" type="text" value="<?=$pconfig['descr'];?>" />
<input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=$referer;?>'" /> <div class="hidden" for="help_for_descr">
<?php if (isset($id) && $a_vlans[$id]): ?> <?=gettext("You may enter a description here for your reference (not parsed).");?>
<input name="id" type="hidden" value="<?=htmlspecialchars($id);?>" /> </div>
<?php endif; ?> </td>
</td> </tr>
</tr> <tr>
</table> <td width="22%" valign="top">&nbsp;</td>
</div> <td width="78%">
</form> <input type="hidden" name="vlanif" value="<?=$pconfig['vlanif']; ?>" />
</div> <input name="Submit" type="submit" class="btn btn-primary" value="<?=gettext("Save");?>" />
</div> <input type="button" class="btn btn-default" value="<?=gettext("Cancel");?>" onclick="window.location.href='<?=(isset($_SERVER['HTTP_REFERER']) ? $_SERVER['HTTP_REFERER'] : '/interfaces_vlan.php');?>'" />
</section> <?php if (isset($id)): ?>
</div> <input name="id" type="hidden" value="<?=$id;?>" />
</div> <?php endif; ?>
</section> </td>
</tr>
</tbody>
</table>
</form>
</div>
</div>
</section>
</div>
</div>
</section>
<?php include("foot.inc"); ?> <?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