Fix the alias replacing when renamed so it does not do casualities like replacing thing with same name. This change prevents i.e. alias Test and Test34 refrenced in alias MyHome after renaming alias Test to Testagain the previous code would replace even Test34 to Testagin34 which is very unexpected.

1 files changed, 8 insertions, 2 deletions

diff --git a/usr/local/www/firewall_aliases_edit.php b/usr/local/www/firewall_aliases_edit.php
index 56159aa..7a49beb 100755
--- a/usr/local/www/firewall_aliases_edit.php
+++ b/usr/local/www/firewall_aliases_edit.php
@@ -244,8 +244,14 @@ if ($_POST) {
 		if (isset($id) && $a_aliases[$id]) {
 			if ($a_aliases[$id]['name'] <> $alias['name']) {
 				foreach ($a_aliases as $aliasid => $aliasd) {
-					if (strstr($aliasd['address'], $a_aliases[$id]['name']))
-						$a_aliases[$aliasid]['address'] = str_replace($a_aliases[$id]['name'], $alias['name'], $a_aliases[$aliasid]['address']);
+					if ($aliasd['address'] <> "") {
+						$tmpaddr = explode(" ", $aliasd['address']);
+						foreach ($tmpaddr as $tmpidx => $tmpalias) {
+							if ($tmpalias == $a_aliases[$id]['name'])
+								$tmpaddr[$tmpidx] = $alias['name'];
+						}
+						$a_aliases[$aliasid]['address'] = implode(" ", $tmpaddr);
+					}
 				}
 			}
 			$a_aliases[$id] = $alias;