lucaspalomodevelop/core
1
0
Fork 0
mirror of https://github.com/lucaspalomodevelop/core.git synced 2026-03-15 17:14:46 +00:00
Code Issues Packages Projects Releases Wiki Activity

(vlan's) fix error handling, add description, closes https://github.com/opnsense/core/issues/1247

Browse Source
This commit is contained in:
Ad Schellevis 2016-12-07 14:39:21 +01:00
parent 89c2f17e01
commit 20df3371e4
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
src/www/interfaces_vlan.php
View File

@ -35,7 +35,7 @@ function vlan_inuse($vlan_intf) {
global $config;
foreach ($config['interfaces'] as $if => $intf) {
if ($intf['if'] == $vlan_intf) {
return true;
return $if;
}
}
return false;
@ -53,8 +53,11 @@ if ($_SERVER['REQUEST_METHOD'] === 'POST') {
}
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.");
if (($ifid = vlan_inuse($a_vlans[$id]['vlanif'])) !== false) {
$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 {
if (does_interface_exist($a_vlans[$id]['vlanif'])) {
legacy_interface_destroy($a_vlans[$id]['vlanif']);