Skip to content
Projects
Groups
Snippets
Help
Loading...
Help
Submit feedback
Contribute to GitLab
Sign in
Toggle navigation
O
OpnSense
Project
Project
Details
Activity
Releases
Cycle Analytics
Repository
Repository
Files
Commits
Branches
Tags
Contributors
Graph
Compare
Charts
Issues
0
Issues
0
List
Boards
Labels
Milestones
Merge Requests
0
Merge Requests
0
CI / CD
CI / CD
Pipelines
Jobs
Schedules
Charts
Wiki
Wiki
Snippets
Snippets
Members
Members
Collapse sidebar
Close sidebar
Activity
Graph
Charts
Create a new issue
Jobs
Commits
Issue Boards
Open sidebar
Kulya
OpnSense
Commits
20df3371
Commit
20df3371
authored
Dec 07, 2016
by
Ad Schellevis
Browse files
Options
Browse Files
Download
Email Patches
Plain Diff
(vlan's) fix error handling, add description, closes
https://github.com/opnsense/core/issues/1247
parent
89c2f17e
Changes
1
Hide whitespace changes
Inline
Side-by-side
Showing
1 changed file
with
6 additions
and
3 deletions
+6
-3
interfaces_vlan.php
src/www/interfaces_vlan.php
+6
-3
No files found.
src/www/interfaces_vlan.php
View file @
20df3371
...
@@ -35,7 +35,7 @@ function vlan_inuse($vlan_intf) {
...
@@ -35,7 +35,7 @@ function vlan_inuse($vlan_intf) {
global
$config
;
global
$config
;
foreach
(
$config
[
'interfaces'
]
as
$if
=>
$intf
)
{
foreach
(
$config
[
'interfaces'
]
as
$if
=>
$intf
)
{
if
(
$intf
[
'if'
]
==
$vlan_intf
)
{
if
(
$intf
[
'if'
]
==
$vlan_intf
)
{
return
true
;
return
$if
;
}
}
}
}
return
false
;
return
false
;
...
@@ -53,8 +53,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
...
@@ -53,8 +53,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
}
if
(
!
empty
(
$_POST
[
'action'
])
&&
$_POST
[
'action'
]
==
"del"
&&
isset
(
$id
))
{
if
(
!
empty
(
$_POST
[
'action'
])
&&
$_POST
[
'action'
]
==
"del"
&&
isset
(
$id
))
{
if
(
vlan_inuse
(
$a_vlans
[
$id
]))
{
if
((
$ifid
=
vlan_inuse
(
$a_vlans
[
$id
][
'vlanif'
]))
!==
false
)
{
$input_errors
[]
=
gettext
(
"This VLAN cannot be deleted because it is still being used as an interface."
);
$ifdescr
=
empty
(
$config
[
'interfaces'
][
$ifid
][
'descr'
])
?
$ifid
:
$config
[
'interfaces'
][
$ifid
][
'descr'
];
$input_errors
[]
=
sprintf
(
gettext
(
"This VLAN cannot be deleted because it is still being used as an interface (%s)."
)
,
$ifdescr
);
}
else
{
}
else
{
if
(
does_interface_exist
(
$a_vlans
[
$id
][
'vlanif'
]))
{
if
(
does_interface_exist
(
$a_vlans
[
$id
][
'vlanif'
]))
{
legacy_interface_destroy
(
$a_vlans
[
$id
][
'vlanif'
]);
legacy_interface_destroy
(
$a_vlans
[
$id
][
'vlanif'
]);
...
...
Write
Preview
Markdown
is supported
0%
Try again
or
attach a new file
Attach a file
Cancel
You are about to add
0
people
to the discussion. Proceed with caution.
Finish editing this message first!
Cancel
Please
register
or
sign in
to comment