summaryrefslogtreecommitdiffstats
path: root/usr/local/www/interfaces_vlan_edit.php
diff options
context:
space:
mode:
authorErmal <eri@pfsense.org>2011-06-27 19:01:43 +0000
committerErmal <eri@pfsense.org>2011-06-27 19:01:43 +0000
commitb0d6223f89007156e93fa6bb76fe92f9300b11b3 (patch)
treea1409e7413c6a0c8a2bc20531447bd0f0924cda5 /usr/local/www/interfaces_vlan_edit.php
parentf257c139312002e38468012137f93eb8230cec38 (diff)
downloadpfsense-b0d6223f89007156e93fa6bb76fe92f9300b11b3.zip
pfsense-b0d6223f89007156e93fa6bb76fe92f9300b11b3.tar.gz
When editing a vlan and chaning its tag id and the vlan is assigned correct even the interface name of the assignment otherwise we result in breaking the install.
Diffstat (limited to 'usr/local/www/interfaces_vlan_edit.php')
-rwxr-xr-xusr/local/www/interfaces_vlan_edit.php10
1 files changed, 7 insertions, 3 deletions
diff --git a/usr/local/www/interfaces_vlan_edit.php b/usr/local/www/interfaces_vlan_edit.php
index 08f1a53..b6cea47 100755
--- a/usr/local/www/interfaces_vlan_edit.php
+++ b/usr/local/www/interfaces_vlan_edit.php
@@ -98,11 +98,16 @@ if ($_POST) {
if (!$input_errors) {
if (isset($id) && $a_vlans[$id]) {
if (($a_vlans[$id]['if'] != $_POST['if']) || ($a_vlans[$id]['tag'] != $_POST['tag'])) {
- if (!empty($a_vlans[$id]['vlanif']))
+ if (!empty($a_vlans[$id]['vlanif'])) {
+ $confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
// Destroy previous vlan
pfSense_interface_destroy($a_vlans[$id]['vlanif']);
- else
+ } else {
pfSense_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']}");
+ }
+ if ($confif <> "")
+ $config['interfaces'][$confif]['if'] = "{$_POST['if']}_vlan{$_POST['tag']}";
}
}
$vlan = array();
@@ -122,7 +127,6 @@ if ($_POST) {
write_config();
- $confif = convert_real_interface_to_friendly_interface_name($vlan['vlanif']);
if ($confif <> "")
interface_configure($confif);
OpenPOWER on IntegriCloud