diff options
author | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:06:39 -0300 |
---|---|---|
committer | Renato Botelho <renato.botelho@bluepex.com> | 2010-08-03 11:06:39 -0300 |
commit | 4256d115c9328d3498451e7777f5724fed5f071b (patch) | |
tree | 0939bc82557d26824bec04c198ced8a036c8ac09 /usr/local/www/interfaces_groups_edit.php | |
parent | f6a2c6ab840b6b98c74e68e3f0a31eaa46267ba0 (diff) | |
parent | 073a2697dd86a8dece8dafa28b71084a547ba31e (diff) | |
download | pfsense-4256d115c9328d3498451e7777f5724fed5f071b.zip pfsense-4256d115c9328d3498451e7777f5724fed5f071b.tar.gz |
Merge remote branch 'mainline/master' into 3_interfaces
Conflicts:
usr/local/www/diag_nanobsd.php
usr/local/www/diag_packet_capture.php
usr/local/www/interfaces.php
Diffstat (limited to 'usr/local/www/interfaces_groups_edit.php')
-rwxr-xr-x | usr/local/www/interfaces_groups_edit.php | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/usr/local/www/interfaces_groups_edit.php b/usr/local/www/interfaces_groups_edit.php index 966a05e..e1a9666 100755 --- a/usr/local/www/interfaces_groups_edit.php +++ b/usr/local/www/interfaces_groups_edit.php @@ -73,6 +73,11 @@ if ($_POST) { if (preg_match("/([^a-zA-Z])+/", $_POST['ifname'], $match)) $input_errors[] = gettext("Only letters A-Z are allowed as the group name."); + $ifaces = get_configured_interface_with_descr(); + foreach ($ifaces as $gif => $gdescr) { + if ($gdescr == $_POST['ifname'] || $gif == $_POST['ifname']) + $input_errors[] = "The specified group name is already used by an interface. Please choose another name."; + } $ifgroupentry = array(); $ifgroupentry['ifname'] = $_POST['ifname']; $members = ""; |