Redmine #5162 do not allow alias rename to an existing name - RELENG_2_2

1 files changed, 4 insertions, 6 deletions

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index ded7a85..2455d65 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -146,12 +146,10 @@ if ($_POST) {
 			$input_errors[] = gettext("The alias name must be less than 32 characters long, may not consist of only numbers, and may only contain the following characters") . " a-z, A-Z, 0-9, _.";
 	}
 	/* 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;
 		}
 	}