diff options
| author | Phil Davis <phil.davis@inf.org> | 2015-09-21 13:13:29 +0545 |
|---|---|---|
| committer | Phil Davis <phil.davis@inf.org> | 2015-09-21 13:13:29 +0545 |
| commit | ea85a0ce78a9d254637c16507b3e0cad7fc3b695 (patch) | |
| tree | 7cc3d067a1e92f16bbaa3358c48747d23026479b /src | |
| parent | 3c596efc107243ac908b40bbf820ca7e5ff0cd30 (diff) | |
| download | pfsense-ea85a0ce78a9d254637c16507b3e0cad7fc3b695.zip pfsense-ea85a0ce78a9d254637c16507b3e0cad7fc3b695.tar.gz | |
Redmine #5162 do not allow alias rename to an existing name - master
Diffstat (limited to 'src')
| -rwxr-xr-x | src/usr/local/www/firewall_aliases_edit.php | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/src/usr/local/www/firewall_aliases_edit.php b/src/usr/local/www/firewall_aliases_edit.php index 9f918f8..7e6a892 100755 --- a/src/usr/local/www/firewall_aliases_edit.php +++ b/src/usr/local/www/firewall_aliases_edit.php @@ -182,12 +182,10 @@ if ($_POST) { } } /* check for name conflicts */ - if (empty($a_aliases[$id])) { - foreach ($a_aliases as $alias) { - if ($alias['name'] == $_POST['name']) { - $input_errors[] = gettext("An alias with this name already exists."); - break; - } + foreach ($a_aliases as $key => $alias) { + if (($alias['name'] == $_POST['name']) && (empty($a_aliases[$id]) || ($key != $id))) { + $input_errors[] = gettext("An alias with this name already exists."); + break; } } |
